This commit was manufactured by cvs2svn to create tag 'RELEASE_4_6_2'.release/4.6.2

9 files changed, 0 insertions, 240 deletions

diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
deleted file mode 100644
index 6fd51a8b4656..000000000000
--- a/multimedia/ogle/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-# New ports collection makefile for:	ogle
-# Date created:				Tue Oct 16 18:35:39 BRST 2001
-# Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ogle
-PORTVERSION=	0.8.2
-PORTREVISION=	1
-CATEGORIES=	graphics
-MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
-
-MAINTAINER=	lioux@FreeBSD.org
-
-LIB_DEPENDS=	a52.0:${PORTSDIR}/audio/liba52 \
-		dvdread.2:${PORTSDIR}/graphics/libdvdread \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		xml2.5:${PORTSDIR}/textproc/libxml2
-
-USE_SUBMAKE=	yes
-USE_XLIB=	yes
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
-CONFIGURE_ARGS=	--with-libjpeg=${LOCALBASE} \
-		--with-dvdread=${LOCALBASE} \
-		--with-liba52=${LOCALBASE}
-MAKE_ENV=	SDL_CONFIG=${SDL_CONFIG}
-INSTALLS_SHLIB=	yes
-
-CUT?=	/usr/bin/cut
-
-MAN1=	ogle.1
-MAN5=	oglerc.5
-
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-
-post-patch:
-.ifdef(WITH_DVD_DEVICE)
-	@${PERL} -pi.orig -e \
-		"s|(DEFAULT_DVD_DEVICE=\")/dev/acd0c(\")|\1${WITH_DVD_DEVICE}\2|" \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-.endif
-	@${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|" ${WRKSRC}/scripts/ogle.in
-	@${PERL} -pi -e 's|(xmlversion.h>)|libxml/\1|; \
-		s|(-la52)|\1 ${LIBA52_DEP_LIBS}|' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-
-pre-configure:
-	@${TOUCH} `find -E ${WRKSRC} -regex ".*Makefile\.(am|in)"`
-	@${TOUCH} ${WRKSRC}/configure.in ${WRKSRC}/configure
-
-post-configure:
-	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.pre.mk>
-
-# hack to make ogle work with liba52 + djbfft
-.if exists(${LOCALBASE}/lib/liba52.la)
-LIBA52_DEP_LIBS!=	${GREP} dependency_libs ${LOCALBASE}/lib/liba52.la | ${CUT} -d \' -f 2
-.else
-LIBA52_DEP_LIBS=
-.endif
-
-.if ${ARCH} == "i386"
-. if (defined(MACHINE_CPU) && ${MACHINE_CPU:Mi486} == "i486")
-WITH_OPTIMIZED_BYTESWAP=yes
-. endif
-
-. if defined(WITH_OPTIMIZED_BYTESWAP)
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-include:ogle_endian.h
-. endif
-.endif
-
-pre-everything::
-.ifndef(WITH_DVD_DEVICE)
-	@${ECHO_MSG} '===> The default DVD device is /dev/acd0c'
-	@${ECHO_MSG} "===> You can choose any DVD device at Ogle's command line"
-	@${ECHO_MSG} '===> Define WITH_DVD_DEVICE if you want to change the default'
-	@${ECHO_MSG} "===> For example, 'make WITH_DVD_DEVICE=\"/dev/somedevice\"'"
-.endif
-.ifndef(WITH_OPTIMIZED_BYTESWAP)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_OPTIMIZED_BYTESWAP to use optimized byteswap'
-	@${ECHO_MSG} '===> routines. This works only in the i386 architecture, and'
-	@${ECHO_MSG} '===> only with 486 processors and above.'
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/multimedia/ogle/distinfo b/multimedia/ogle/distinfo
deleted file mode 100644
index ff9d664a1a4a..000000000000
--- a/multimedia/ogle/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ogle-0.8.2.tar.gz) = 0b2c949e372b7e79f9106d99c5d2ba45
diff --git a/multimedia/ogle/files/extra-patch-include:ogle_endian.h b/multimedia/ogle/files/extra-patch-include:ogle_endian.h
deleted file mode 100644
index 4ac268a17041..000000000000
--- a/multimedia/ogle/files/extra-patch-include:ogle_endian.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- include/ogle_endian.h.orig	Thu Oct  4 05:42:11 2001
-+++ include/ogle_endian.h	Wed Apr 10 01:16:32 2002
-@@ -39,6 +39,13 @@
- #elif defined(HAVE_SYS_ENDIAN_H)
- #  include <sys/endian.h>
- #  define FROM_BE_32(x) (swap32(x))
-+#elif defined(__FreeBSD__)
-+#  define _KERNEL
-+#  define I486_CPU	/* Will crash unless 486+ */
-+#  include <machine/endian.h>
-+#  undef _KERNEL
-+#  undef I486_CPU
-+#  define FROM_BE_32(x) (ntohl(x))
- #else
- #  warning "No accelerated byte swap found. Using slow c version."
- #  include <inttypes.h>
diff --git a/multimedia/ogle/files/patch-ac3:a52_decoder.c b/multimedia/ogle/files/patch-ac3:a52_decoder.c
deleted file mode 100644
index f1ab072871a7..000000000000
--- a/multimedia/ogle/files/patch-ac3:a52_decoder.c
+++ /dev/null
@@ -1,63 +0,0 @@
---- ac3/a52_decoder.c.orig	Sun Dec  2 19:37:37 2001
-+++ ac3/a52_decoder.c	Fri Apr 12 18:25:07 2002
-@@ -46,6 +46,7 @@
- 
- /* A/52 */
- static ao_instance_t * output = NULL;
-+static a52_state_t *state;
- static sample_t * samples;
- static int disable_dynrng = 0;
- static clocktime_t a52_decode_data(uint8_t *start, uint8_t *end);
-@@ -216,15 +217,20 @@
- 
-   {
-     uint32_t accel;
--    accel = MM_ACCEL_MLIB;
-+    accel = MM_ACCEL_DJBFFT;
- 
-     open_output(get_speaker_flags());
- 
--    samples = a52_init(accel);
--    if(samples == NULL) {
-+    state = a52_init(accel);
-+    if(state == NULL) {
-         FATAL("A/52 init failed\n");
-         exit(1);
-     }
-+    samples = a52_samples(state);
-+    if(samples == NULL) {
-+        FATAL("A/52 samples failed\n");
-+        exit(1);
-+    }
-   }
- 
-   if(msgqid != -1) {
-@@ -675,7 +681,6 @@
- }
- 
- static clocktime_t a52_decode_data(uint8_t *start, uint8_t *end) {
--  static a52_state_t state;
-   
-   static uint8_t buf[3840];
-   static uint8_t *bufptr = buf;
-@@ -736,17 +741,16 @@
- 	
- 	flags = speaker_flags;
- 	flags |= A52_ADJUST_LEVEL;
--	memset(&state, 0, sizeof(a52_state_t));
- 	/* flags (speaker) [in/out] level [in/out] bias [in] */
--	if(a52_frame(&state, buf, &flags, &level, bias)) {
-+	if(a52_frame(state, buf, &flags, &level, bias)) {
- 	  DNOTE("a52_frame() error\n");
- 	  goto error;
- 	}
- 
- 	if(disable_dynrng)
--	  a52_dynrng(&state, NULL, NULL);
-+	  a52_dynrng(state, NULL, NULL);
- 	for(i = 0; i < 6; i++) {
--	  if(a52_block(&state, samples)) {
-+	  if(a52_block(state)) {
- 	    DNOTE("a52_block() error\n");
- 	    goto error;
- 	  }
diff --git a/multimedia/ogle/files/patch-ogle.in b/multimedia/ogle/files/patch-ogle.in
deleted file mode 100644
index 370c029a2004..000000000000
--- a/multimedia/ogle/files/patch-ogle.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/ogle.in.orig	Sat Oct 13 18:49:29 2001
-+++ scripts/ogle.in	Sun Dec 23 17:59:41 2001
-@@ -27,7 +27,7 @@
- if [ -x $DVDP_ROOT/ogle_gui ]; then
- DVDP_UI=$DVDP_ROOT/ogle_gui
- else
--DVDP_UI=$exec_prefix/bin/ogle_gui
-+DVDP_UI=%%X11BASE%%/lib/ogle/ogle_gui
- fi
- export DVDP_UI
- #DVDP_AC3=$DVDP_ROOT/ogle_ac3_p
diff --git a/multimedia/ogle/pkg-comment b/multimedia/ogle/pkg-comment
deleted file mode 100644
index 2a2233d5b0b2..000000000000
--- a/multimedia/ogle/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Open DVD player that supports DVD menus
diff --git a/multimedia/ogle/pkg-descr b/multimedia/ogle/pkg-descr
deleted file mode 100644
index f45a803e7eae..000000000000
--- a/multimedia/ogle/pkg-descr
+++ /dev/null
@@ -1,19 +0,0 @@
-[ from developer's site ]
-
-Ogle is an open DVD player which:
-
-o Supports DVD menus and navigation
-o Reads from mounted, unmounted DVDs and hard drive
-o Reads encrypted and unencrypted DVDs using libdvdread/libdvdcss
-o A new MPEG2 decoder with mmx/altivec/medialib acceleration
-o Normal X11 and XFree86 Xvideo display support with subpicture
-  overlay
-o Accelerated display on Sun FFB2+ cards
-o Angle, audio and subpicture selection
-o Handles advanced subpicture commands such as fade/scroll and wipe
-o Detects and uses correct aspect for movie and menus
-o Possible to play AC3 via S/PDIF with an external command
-o Fullscreen mode
-o Screenshots with and without subpicture overlay
-
-WWW: http://www.dtek.chalmers.se/~dvd/
diff --git a/multimedia/ogle/pkg-message b/multimedia/ogle/pkg-message
deleted file mode 100644
index d5341b26b59b..000000000000
--- a/multimedia/ogle/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-
-================
-IMPORTANT NOTICE
-================
-
-Ogle requires that when playing DVDs,
-the sound be set to AC3. Otherwise,
-no sound will be heard.
-
diff --git a/multimedia/ogle/pkg-plist b/multimedia/ogle/pkg-plist
deleted file mode 100644
index b591d480f4ba..000000000000
--- a/multimedia/ogle/pkg-plist
+++ /dev/null
@@ -1,27 +0,0 @@
-bin/ifo_dump
-bin/ogle
-include/ogle/dvd.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.5
-lib/ogle/libmsgevents.a
-lib/ogle/libmsgevents.la
-lib/ogle/libmsgevents.so
-lib/ogle/libmsgevents.so.4
-lib/ogle/ogle_a52
-lib/ogle/ogle_ac3_p
-lib/ogle/ogle_cli
-lib/ogle/ogle_ctrl
-lib/ogle/ogle_mpeg_ps
-lib/ogle/ogle_mpeg_vs
-lib/ogle/ogle_nav
-lib/ogle/ogle_vout
-share/ogle/ogle_conf.dtd
-share/ogle/oglerc
-@dirrm share/ogle
-@dirrm lib/ogle
-@dirrm include/ogle