diff options
| -rw-r--r-- | multimedia/x264-devel/Makefile | 10 | ||||
| -rw-r--r-- | multimedia/x264-devel/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/x264-devel/patches/patch-ab | 25 |
3 files changed, 18 insertions, 21 deletions
diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile index a221a04d9a0..abc9699adad 100644 --- a/multimedia/x264-devel/Makefile +++ b/multimedia/x264-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2008/03/18 15:05:03 tron Exp $ +# $NetBSD: Makefile,v 1.11 2008/03/31 16:16:00 tron Exp $ # SNAPSHOT_DATE= 20071218 @@ -22,14 +22,6 @@ PKG_DESTDIR_SUPPORT= user-destdir BUILD_DEPENDS+= yasm>=0.4.0:../../devel/yasm .endif -# Avoid linker warning under Mac OS X PPC. -.if empty(MACHINE_PLATFORM:MDarwin-*-powerpc) -DARWIN_PPC_LDFLAGS= -.else -DARWIN_PPC_LDFLAGS= -Wl,-read_only_relocs -Wl,suppress -.endif -MAKE_ENV+= DARWIN_PPC_LDFLAGS=${DARWIN_PPC_LDFLAGS:Q} - USE_TOOLS+= gmake USE_LIBTOOL= yes diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo index 8279074e611..898fbb86550 100644 --- a/multimedia/x264-devel/distinfo +++ b/multimedia/x264-devel/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.8 2008/03/18 15:05:03 tron Exp $ +$NetBSD: distinfo,v 1.9 2008/03/31 16:16:00 tron Exp $ SHA1 (x264-snapshot-20071218-2245.tar.bz2) = b5bc182070e17a8470618bae776488514b67a96a RMD160 (x264-snapshot-20071218-2245.tar.bz2) = 753ab79398bf5bb92b41656ef48ab57dcc63f347 Size (x264-snapshot-20071218-2245.tar.bz2) = 537622 bytes SHA1 (patch-aa) = cce1ef8b7a332e9f9a4c18a8a4246b9382dc4bca -SHA1 (patch-ab) = 60de00034a4cc19aba4a2669eaf91080a5b5b6ac +SHA1 (patch-ab) = 9609529aaa2b2bb2aa1d50cdb2339ee49293dec0 diff --git a/multimedia/x264-devel/patches/patch-ab b/multimedia/x264-devel/patches/patch-ab index ccdf302033a..3b6ab1ca44a 100644 --- a/multimedia/x264-devel/patches/patch-ab +++ b/multimedia/x264-devel/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.5 2008/03/18 15:05:04 tron Exp $ +$NetBSD: patch-ab,v 1.6 2008/03/31 16:16:00 tron Exp $ ---- Makefile.orig 2007-12-18 22:45:04.000000000 +0100 -+++ Makefile -@@ -26,7 +26,7 @@ ASMSRC = common/i386/dct-a.asm common/i +--- Makefile.orig 2007-12-18 21:45:04.000000000 +0000 ++++ Makefile 2008-03-31 17:09:28.000000000 +0100 +@@ -26,7 +26,7 @@ common/i386/mc-a2.asm common/i386/predict-a.asm \ common/i386/pixel-sse2.asm common/i386/quant-a.asm \ common/i386/deblock-a.asm @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.5 2008/03/18 15:05:04 tron Exp $ ASFLAGS += -Icommon/i386/ endif endif -@@ -40,7 +40,7 @@ ASMSRC = common/amd64/dct-a.asm common/ +@@ -40,31 +40,33 @@ common/amd64/mc-a2.asm common/amd64/predict-a.asm \ common/amd64/pixel-sse2.asm common/amd64/quant-a.asm \ common/amd64/deblock-a.asm @@ -20,12 +20,17 @@ $NetBSD: patch-ab,v 1.5 2008/03/18 15:05:04 tron Exp $ ASFLAGS += -Icommon/amd64 endif endif -@@ -51,20 +51,20 @@ ALTIVECSRC += common/ppc/mc.c common/ppc + + # AltiVec optims + ifeq ($(ARCH),PPC) ++ifneq ($(SYS),MACOSX) + ALTIVECSRC += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \ common/ppc/quant.c common/ppc/deblock.c \ common/ppc/predict.c SRCS += $(ALTIVECSRC) -$(ALTIVECSRC:%.c=%.o): CFLAGS += $(ALTIVECFLAGS) +$(ALTIVECSRC:%.c=%.lo): CFLAGS += $(ALTIVECFLAGS) ++endif endif # VIS optims @@ -44,7 +49,7 @@ $NetBSD: patch-ab,v 1.5 2008/03/18 15:05:04 tron Exp $ OBJCLI = $(SRCCLI:%.c=%.o) DEP = depend -@@ -73,15 +73,17 @@ all: default +@@ -73,15 +75,17 @@ default: $(DEP) x264$(EXE) @@ -55,7 +60,7 @@ $NetBSD: patch-ab,v 1.5 2008/03/18 15:05:04 tron Exp $ + ${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} -o $@ $< + +libx264.la: .depend $(OBJS) $(OBJASM) -+ ${LIBTOOL} --mode=link ${CC} -o libx264.la $(OBJS) $(OBJASM) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${DARWIN_PPC_LDFLAGS} -rpath ${PREFIX}/lib -version-info 0 ++ ${LIBTOOL} --mode=link ${CC} -o libx264.la $(OBJS) $(OBJASM) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -rpath ${PREFIX}/lib -version-info 0 $(SONAME): .depend $(OBJS) $(OBJASM) $(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS) @@ -67,7 +72,7 @@ $NetBSD: patch-ab,v 1.5 2008/03/18 15:05:04 tron Exp $ libx264gtk.a: muxers.o libx264.a $(MAKE) -C gtk -@@ -89,10 +91,10 @@ libx264gtk.a: muxers.o libx264.a +@@ -89,10 +93,10 @@ checkasm: tools/checkasm.o libx264.a $(CC) -o $@ $+ $(LDFLAGS) @@ -82,7 +87,7 @@ $NetBSD: patch-ab,v 1.5 2008/03/18 15:05:04 tron Exp $ # delete local/anonymous symbols, so they don't show up in oprofile -@ strip -x $@ -@@ -153,12 +155,9 @@ install: x264 $(SONAME) +@@ -153,12 +157,9 @@ install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig install -m 644 x264.h $(DESTDIR)$(includedir) |