move ogle and ogle_gui to multimedia/

12 files changed, 243 insertions, 1 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index 71ee5175eed..25e27bd78bb 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/01/28 15:01:24 recht Exp $
+# $NetBSD: Makefile,v 1.23 2004/02/03 04:34:06 grant Exp $
 #
 
 COMMENT=	Multimedia utilities
@@ -33,6 +33,8 @@ SUBDIR+=	mplayer
 SUBDIR+=	mplayer-share
 SUBDIR+=	mplex
 SUBDIR+=	ns-flash
+SUBDIR+=	ogle
+SUBDIR+=	ogle_gui
 SUBDIR+=	realplayer
 SUBDIR+=	realplayer-codecs
 SUBDIR+=	trplayer
diff --git a/multimedia/ogle/DESCR b/multimedia/ogle/DESCR
new file mode 100644
index 00000000000..95bd5783022
--- /dev/null
+++ b/multimedia/ogle/DESCR
@@ -0,0 +1,5 @@
+Ogle is a open source DVD player that supports DVD menus and
+navigation. You should be able to play DVDs  directly from the
+device, a mounted fs, an image file or as copy on you harddrive.
+Keyboard commands for navigation in both player modes, if you
+have input foucus in the video window.
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
new file mode 100644
index 00000000000..00c9da74036
--- /dev/null
+++ b/multimedia/ogle/Makefile
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile,v 1.1 2004/02/03 04:34:06 grant Exp $
+
+DISTNAME=	ogle-0.9.2
+PKGREVISION=	1
+CATEGORIES=	multimedia
+MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
+
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://www.dtek.chalmers.se/groups/dvd/
+COMMENT=	DVD player with menus
+
+ONLY_FOR_PLATFORM=	NetBSD-1.5.[23]*-i386 NetBSD-1.5[Y-Z]*-i386
+ONLY_FOR_PLATFORM+=	NetBSD-1.[6-9]*-i386 NetBSD-[2-9]*-i386
+ONLY_FOR_PLATFORM+=	NetBSD-1.6[D-Z]*-powerpc NetBSD-1.[7-9]*-powerpc
+ONLY_FOR_PLATFORM+=	NetBSD-[2-9]*-powerpc
+ONLY_FOR_PLATFORM+=	NetBSD-1.6Z*-alpha NetBSD-[2-9]*-alpha
+
+USE_BUILDLINK2=		yes
+USE_X11=		yes
+USE_GNU_TOOLS+=		make
+USE_LIBTOOL=		yes
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+#CONFIGURE_ARGS+=	--enable-obsdaudio
+#CONFIGURE_ARGS+=	--disable-sunaudio
+
+GCC_REQD+=		2.95.3
+
+.include "../../audio/liba52/buildlink2.mk"
+.include "../../audio/libmad/buildlink2.mk"
+.include "../../devel/binutils/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../multimedia/libdvdread/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ogle/PLIST b/multimedia/ogle/PLIST
new file mode 100644
index 00000000000..dbdc5ef8f75
--- /dev/null
+++ b/multimedia/ogle/PLIST
@@ -0,0 +1,41 @@
+@comment $NetBSD: PLIST,v 1.1 2004/02/03 04:34:06 grant Exp $
+bin/ifo_dump
+bin/ogle
+include/ogle/dvd.h
+include/ogle/dvdbookmarks.h
+include/ogle/dvdcontrol.h
+include/ogle/dvdevents.h
+include/ogle/msgevents.h
+lib/ogle/libdvdcontrol.a
+lib/ogle/libdvdcontrol.la
+lib/ogle/libdvdcontrol.so
+lib/ogle/libdvdcontrol.so.11
+lib/ogle/libdvdcontrol.so.11.0
+lib/ogle/libmsgevents.a
+lib/ogle/libmsgevents.la
+lib/ogle/libmsgevents.so
+lib/ogle/libmsgevents.so.8
+lib/ogle/libmsgevents.so.8.0
+lib/ogle/ogle_ac3_p
+lib/ogle/ogle_audio
+lib/ogle/ogle_audio_debug
+lib/ogle/ogle_cli
+lib/ogle/ogle_cli_debug
+lib/ogle/ogle_ctrl
+lib/ogle/ogle_ctrl_debug
+lib/ogle/ogle_gui_debug
+lib/ogle/ogle_mpeg_ps
+lib/ogle/ogle_mpeg_ps_debug
+lib/ogle/ogle_mpeg_vs
+lib/ogle/ogle_mpeg_vs_debug
+lib/ogle/ogle_nav
+lib/ogle/ogle_nav_debug
+lib/ogle/ogle_vout
+lib/ogle/ogle_vout_debug
+man/man1/ogle.1
+man/man5/oglerc.5
+share/ogle/ogle_conf.dtd
+share/ogle/oglerc
+@dirrm share/ogle
+@dirrm include/ogle
+@dirrm lib/ogle
diff --git a/multimedia/ogle/buildlink2.mk b/multimedia/ogle/buildlink2.mk
new file mode 100644
index 00000000000..505cedda5ed
--- /dev/null
+++ b/multimedia/ogle/buildlink2.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink2.mk,v 1.1 2004/02/03 04:34:06 grant Exp $
+
+.if !defined(OGLE_BUILDLINK2_MK)
+OGLE_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		ogle
+BUILDLINK_DEPENDS.ogle?=	ogle>=0.9.2
+BUILDLINK_PKGSRCDIR.ogle?=	../../multimedia/ogle
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.ogle=ogle
+BUILDLINK_PREFIX.ogle_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.ogle=		include/ogle/*.h
+BUILDLINK_FILES.ogle+=		lib/ogle/libmsgevents.*
+BUILDLINK_FILES.ogle+=		lib/ogle/libdvdcontrol.*
+
+BUILDLINK_LDFLAGS.ogle=		-L${BUILDLINK_PREFIX.ogle}/lib/ogle
+BUILDLINK_LDFLAGS.ogle+=	-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.ogle}/lib/ogle
+
+BUILDLINK_TARGETS+=	ogle-buildlink
+
+ogle-buildlink: _BUILDLINK_USE
+
+.endif	# OGLE_BUILDLINK2_MK
diff --git a/multimedia/ogle/distinfo b/multimedia/ogle/distinfo
new file mode 100644
index 00000000000..ab66b1a78a5
--- /dev/null
+++ b/multimedia/ogle/distinfo
@@ -0,0 +1,4 @@
+$NetBSD: distinfo,v 1.1 2004/02/03 04:34:06 grant Exp $
+
+SHA1 (ogle-0.9.2.tar.gz) = bf44e835d04634b4e52fb50bab2a1b78e69391eb
+Size (ogle-0.9.2.tar.gz) = 488984 bytes
diff --git a/multimedia/ogle_gui/DESCR b/multimedia/ogle_gui/DESCR
new file mode 100644
index 00000000000..1fe7b3833a3
--- /dev/null
+++ b/multimedia/ogle_gui/DESCR
@@ -0,0 +1 @@
+ogle_gui is the gtk based frontend for the ogle DVD player.
diff --git a/multimedia/ogle_gui/Makefile b/multimedia/ogle_gui/Makefile
new file mode 100644
index 00000000000..eab7ea2efca
--- /dev/null
+++ b/multimedia/ogle_gui/Makefile
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile,v 1.1 2004/02/03 04:34:06 grant Exp $
+
+DISTNAME=	ogle_gui-0.9.2
+PKGREVISION=	2
+CATEGORIES=	multimedia
+MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
+
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://www.dtek.chalmers.se/groups/dvd/
+COMMENT=	GUI for the Ogle DVD player
+
+USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
+USE_X11=		yes
+USE_GNU_TOOLS+=		make
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--bindir=${PREFIX}/lib/ogle
+
+GCC_REQD+=		2.95.3
+
+USE_LIBTOOL=		yes
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
+LDFLAGS+=	${BUILDLINK_LDFLAGS.ogle}
+
+.include "../../devel/binutils/buildlink2.mk"
+.include "../../devel/libglade/buildlink2.mk"
+.include "../../graphics/ogle/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ogle_gui/PLIST b/multimedia/ogle_gui/PLIST
new file mode 100644
index 00000000000..3edad9b2ef1
--- /dev/null
+++ b/multimedia/ogle_gui/PLIST
@@ -0,0 +1,32 @@
+@comment $NetBSD: PLIST,v 1.1 2004/02/03 04:34:06 grant Exp $
+lib/ogle/ogle_gui
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/ogle_gui.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/ogle_gui.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/ogle_gui.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/ogle_gui.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/ogle_gui.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/ogle_gui.mo
+share/ogle_gui/angle.xpm
+share/ogle_gui/enter.xpm
+share/ogle_gui/fastforward.xpm
+share/ogle_gui/go_up.xpm
+share/ogle_gui/menus.xpm
+share/ogle_gui/ogle.xpm
+share/ogle_gui/ogle_gui.glade
+share/ogle_gui/ogle_gui.glade2
+share/ogle_gui/rewind.xpm
+share/ogle_gui/skip_backwards.xpm
+share/ogle_gui/skip_forwards.xpm
+share/ogle_gui/stock_down_arrow.xpm
+share/ogle_gui/stock_first.xpm
+share/ogle_gui/stock_last.xpm
+share/ogle_gui/stock_left_arrow.xpm
+share/ogle_gui/stock_pause.xpm
+share/ogle_gui/stock_right_arrow.xpm
+share/ogle_gui/stock_stop.xpm
+share/ogle_gui/stock_timer.xpm
+share/ogle_gui/stock_timer_stopped.xpm
+share/ogle_gui/stock_up_arrow.xpm
+share/ogle_gui/stock_volume.xpm
+share/ogle_gui/subpicture.xpm
+@dirrm share/ogle_gui
diff --git a/multimedia/ogle_gui/distinfo b/multimedia/ogle_gui/distinfo
new file mode 100644
index 00000000000..9e5988d0474
--- /dev/null
+++ b/multimedia/ogle_gui/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2004/02/03 04:34:06 grant Exp $
+
+SHA1 (ogle_gui-0.9.2.tar.gz) = 0d73ec30852b9cd2a9714b5088f6ab6deecf097d
+Size (ogle_gui-0.9.2.tar.gz) = 396673 bytes
+SHA1 (patch-aa) = 818777c5474f6a99fbaa732f77c632dad4e12a22
+SHA1 (patch-ac) = 2aa173ace19f55d56d9d996b74db2dd59e4e0ef2
diff --git a/multimedia/ogle_gui/patches/patch-aa b/multimedia/ogle_gui/patches/patch-aa
new file mode 100644
index 00000000000..009eff42634
--- /dev/null
+++ b/multimedia/ogle_gui/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2004/02/03 04:34:06 grant Exp $
+
+--- configure.orig	2003-11-05 23:02:32.000000000 +0100
++++ configure
+@@ -11554,7 +11554,7 @@ _ACEOF
+       *)
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define LIBGLADE_LIB "libglade.so.0"
++#define LIBGLADE_LIB "libglade.so"
+ _ACEOF
+ 
+ 	;;
diff --git a/multimedia/ogle_gui/patches/patch-ac b/multimedia/ogle_gui/patches/patch-ac
new file mode 100644
index 00000000000..1466b121da8
--- /dev/null
+++ b/multimedia/ogle_gui/patches/patch-ac
@@ -0,0 +1,44 @@
+$NetBSD: patch-ac,v 1.1 2004/02/03 04:34:06 grant Exp $
+
+--- src/debug_print.h.orig	2003-11-05 20:06:50.000000000 +0100
++++ src/debug_print.h
+@@ -5,20 +5,25 @@
+ 
+ #if defined(__GNUC__) && ( __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 95))
+ 
+-#define FATAL(str, args...) \
+-fprintf(stderr, "FATAL[%s]: " str, program_name, ## args)
+-
+-#define ERROR(str, args...) \
+-fprintf(stderr, "ERROR[%s]: " str, program_name, ## args)
+-
+-#define WARNING(str, ...) \
+-fprintf(stderr, "WARNING[%s]: " str, program_name, ## args)
+-
+-#define NOTE(str, args...) \
+-fprintf(stderr, "Note[%s]: " str, program_name, ## args)
+-
+-#define DNOTE(str, args...) \
+-fprintf(stderr, "Debug[%s]: " str, program_name, ## args)
++#define FATAL(str...) _FATAL( , ##str)
++#define _FATAL(str, args...) \
++fprintf(stderr, "FATAL[%s]: " str, program_name, ##args)
++
++#define ERROR(str...) _ERROR( , ##str)
++#define _ERROR(str, args...) \
++fprintf(stderr, "ERROR[%s]: " str, program_name, ##args)
++
++#define WARNING(str...) _WARNING( , ##str)
++#define _WARNING(str, args...) \
++fprintf(stderr, "WARNING[%s]: " str, program_name, ##args)
++
++#define NOTE(str...) _NOTE(, ##str)
++#define _NOTE(str, args...) \
++fprintf(stderr, "Note[%s]: " str, program_name, ##args)
++
++#define DNOTE(str...) _DNOTE( , ##str)
++#define _DNOTE(str, args...) \
++fprintf(stderr, "Debug[%s]: " str, program_name, ##args)
+ 
+ 
+ #else /* __GNUC__ < 2 */