From 77638ea326cdd589188bb9169a457d56541d7a42 Mon Sep 17 00:00:00 2001 From: brad Date: Tue, 22 Jun 2004 08:13:11 +0000 Subject: [PATCH] - disable the Vidix support - instead of passing --target for powerpc just make the configure script recognize macppc as another name for a powerpc system ok MAINTAINER --- x11/mplayer/Makefile | 11 ++++----- x11/mplayer/patches/patch-configure | 15 +++++++++--- x11/mplayer/patches/patch-libdha_Makefile | 23 ------------------- .../patches/patch-vidix_drivers_Makefile | 12 ---------- x11/mplayer/pkg/PFRAG.shared | 3 --- x11/mplayer/pkg/PLIST | 14 +---------- 6 files changed, 18 insertions(+), 60 deletions(-) delete mode 100644 x11/mplayer/patches/patch-libdha_Makefile delete mode 100644 x11/mplayer/patches/patch-vidix_drivers_Makefile delete mode 100644 x11/mplayer/pkg/PFRAG.shared diff --git a/x11/mplayer/Makefile b/x11/mplayer/Makefile index b0bb9ea0b3b..4f042c9ba6f 100644 --- a/x11/mplayer/Makefile +++ b/x11/mplayer/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.70 2004/06/15 02:19:56 brad Exp $ +# $OpenBSD: Makefile,v 1.71 2004/06/22 08:13:11 brad Exp $ # May not be hard to add more. ONLY_FOR_ARCHS= amd64 i386 powerpc @@ -54,8 +54,8 @@ CONFIGURE_ARGS+=--disable-alsa \ --disable-nas \ --disable-liblzo \ --disable-caca \ + --disable-vidix \ --enable-select \ - --enable-vidix \ --enable-vorbis \ --enable-menu \ --enable-iconv \ @@ -63,16 +63,15 @@ CONFIGURE_ARGS+=--disable-alsa \ --with-extraincdir=${LOCALBASE}/include/libpng:${LOCALBASE}/include \ --with-extralibdir=${LOCALBASE}/lib \ --confdir=${CONFDIR} -CONFIGURE_ENV+="TMPDIR=${WRKBUILD}" +CONFIGURE_ENV+= TMPDIR="${WRKBUILD}" .if ${MACHINE_ARCH:Mi386} CONFIGURE_ARGS+=--enable-runtime-cpudetection .endif .if ${MACHINE_ARCH:Mpowerpc} -CONFIGURE_ARGS+=--target=ppc-openbsd \ - --disable-altivec -.endif +CONFIGURE_ARGS+=--disable-altivec + .endif FLAVORS= arts esd sdl ggi debug mad win32 no_x11 aa FLAVOR?= diff --git a/x11/mplayer/patches/patch-configure b/x11/mplayer/patches/patch-configure index da00c5f077b..68ea6f60b21 100644 --- a/x11/mplayer/patches/patch-configure +++ b/x11/mplayer/patches/patch-configure @@ -1,6 +1,15 @@ -$OpenBSD: patch-configure,v 1.26 2004/05/06 07:27:49 biorn Exp $ ---- configure.orig 2004-04-26 11:44:06.000000000 +0200 -+++ configure 2004-04-28 12:24:12.000000000 +0200 +$OpenBSD: patch-configure,v 1.27 2004/06/22 08:13:11 brad Exp $ +--- configure.orig 2004-04-26 05:44:06.000000000 -0400 ++++ configure 2004-05-28 22:12:05.000000000 -0400 +@@ -440,7 +440,7 @@ if test -z "$_target" ; then + i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;; + ia64) host_arch=ia64 ;; + x86_64|amd64) host_arch=x86_64 ;; +- ppc) host_arch=ppc ;; ++ macppc|ppc) host_arch=ppc ;; + alpha) host_arch=alpha ;; + sparc*) host_arch=sparc ;; + parisc*|hppa*|9000*) host_arch=hppa ;; @@ -4148,7 +4148,7 @@ echores "$_sgiaudio" diff --git a/x11/mplayer/patches/patch-libdha_Makefile b/x11/mplayer/patches/patch-libdha_Makefile deleted file mode 100644 index dc647325861..00000000000 --- a/x11/mplayer/patches/patch-libdha_Makefile +++ /dev/null @@ -1,23 +0,0 @@ -$OpenBSD: patch-libdha_Makefile,v 1.13 2004/05/01 18:43:43 sturm Exp $ ---- libdha/Makefile.orig 2003-10-22 22:17:23.000000000 +0200 -+++ libdha/Makefile 2004-05-01 19:19:39.000000000 +0200 -@@ -53,8 +53,6 @@ ifeq ($(TARGET_MINGW32),yes) - else - #$(CC) -shared $(SONAME_FLAGS) -o $(LIBNAME) $(OBJS) $(LIBS) - $(CC) -shared -Wl,-soname -Wl,$(LIBNAME) -o $(LIBNAME) $(OBJS) $(LIBS) -- ln -sf $(LIBNAME) $(SHORTNAME) -- ln -sf $(LIBNAME) $(VSHORTNAME) - endif - - all: $(LIBNAME) $(SHORTNAME) -@@ -80,10 +78,7 @@ depend: pci_names.c - install: - mkdir -p $(prefix)/lib - install -m 755 -s -p $(LIBNAME) $(prefix)/lib/$(LIBNAME) -- rm -f $(prefix)/lib/libdha.so -- ln -sf $(LIBNAME) $(prefix)/lib/$(SHORTNAME) - ifeq ($(TARGET_OS),OpenBSD) -- ldconfig -R - else - ldconfig - endif diff --git a/x11/mplayer/patches/patch-vidix_drivers_Makefile b/x11/mplayer/patches/patch-vidix_drivers_Makefile deleted file mode 100644 index 9977c423f7c..00000000000 --- a/x11/mplayer/patches/patch-vidix_drivers_Makefile +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-vidix_drivers_Makefile,v 1.7 2003/12/16 17:17:33 biorn Exp $ ---- vidix/drivers/Makefile.orig 2003-10-22 18:45:33.000000000 +0200 -+++ vidix/drivers/Makefile 2003-12-09 06:45:32.000000000 +0100 -@@ -138,7 +138,7 @@ depend: - - install: - mkdir -p $(LIBDIR)/mplayer/vidix -- -install -m 755 -s -p *.so $(LIBDIR)/mplayer/vidix -+ -install -m 755 -p *.so $(LIBDIR)/mplayer/vidix - uninstall: - rm -f $(LIBDIR)/mplayer/vidix/*.so - rmdir -p --ignore-fail-on-non-empty $(LIBDIR)/mplayer/vidix diff --git a/x11/mplayer/pkg/PFRAG.shared b/x11/mplayer/pkg/PFRAG.shared deleted file mode 100644 index 0d3bb0bce01..00000000000 --- a/x11/mplayer/pkg/PFRAG.shared +++ /dev/null @@ -1,3 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.2 2003/11/02 23:30:27 brad Exp $ -lib/libdha.so.0.1 -DYNLIBDIR(%D/lib) diff --git a/x11/mplayer/pkg/PLIST b/x11/mplayer/pkg/PLIST index 62bcb5f546d..bd9ecbc6f61 100644 --- a/x11/mplayer/pkg/PLIST +++ b/x11/mplayer/pkg/PLIST @@ -1,16 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.12 2004/05/06 07:27:49 biorn Exp $ +@comment $OpenBSD: PLIST,v 1.13 2004/06/22 08:13:12 brad Exp $ bin/mencoder bin/mplayer -lib/mplayer/vidix/cyberblade_vid.so -lib/mplayer/vidix/mach64_vid.so -lib/mplayer/vidix/mga_crtc2_vid.so -lib/mplayer/vidix/mga_vid.so -lib/mplayer/vidix/nvidia_vid.so -lib/mplayer/vidix/pm3_vid.so -lib/mplayer/vidix/radeon_vid.so -lib/mplayer/vidix/rage128_vid.so -lib/mplayer/vidix/sis_vid.so -%%SHARED%% man/man1/mencoder.1 man/man1/mplayer.1 share/doc/mplayer/amiga.html @@ -91,6 +81,4 @@ share/examples/mplayer/mplayer.conf @comment @dirrm share/mplayer @dirrm share/examples/mplayer @dirrm share/doc/mplayer -@dirrm lib/mplayer/vidix -@dirrm lib/mplayer @extraunexec rm -rf ${CONFDIR}