diff options
author | adam <adam@pkgsrc.org> | 2014-08-10 15:39:15 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2014-08-10 15:39:15 +0000 |
commit | 0e8f13499c485807ff2099d002c457958d3ab39e (patch) | |
tree | 775cdc1ae83608a666966727c1c375ed402ca1d4 /multimedia | |
parent | 0e652f78814d41b0850be35798b7812cebc37135 (diff) | |
download | pkgsrc-0e8f13499c485807ff2099d002c457958d3ab39e.tar.gz |
Changes 20140809:
Bug fixes and improvements.
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/x264-devel/Makefile | 5 | ||||
-rw-r--r-- | multimedia/x264-devel/distinfo | 12 | ||||
-rw-r--r-- | multimedia/x264-devel/patches/patch-aa | 27 | ||||
-rw-r--r-- | multimedia/x264-devel/patches/patch-ab | 36 |
4 files changed, 29 insertions, 51 deletions
diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile index ff16ce2c05d..1cb7f0a2cbf 100644 --- a/multimedia/x264-devel/Makefile +++ b/multimedia/x264-devel/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.48 2014/05/29 23:37:02 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2014/08/10 15:39:15 adam Exp $ -SNAPSHOT_DATE= 20140303 +SNAPSHOT_DATE= 20140809 DISTNAME= x264-snapshot-${SNAPSHOT_DATE}-2245 PKGNAME= x264-devel-${SNAPSHOT_DATE} -PKGREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ EXTRACT_SUFX= .tar.bz2 diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo index b855e25586f..184d0c3dbbf 100644 --- a/multimedia/x264-devel/distinfo +++ b/multimedia/x264-devel/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.32 2014/03/04 13:59:11 adam Exp $ +$NetBSD: distinfo,v 1.33 2014/08/10 15:39:15 adam Exp $ -SHA1 (x264-snapshot-20140303-2245.tar.bz2) = c308b92ab11f8dcd8c655005f0d10d8a40e35154 -RMD160 (x264-snapshot-20140303-2245.tar.bz2) = fcbd2c0df27a6b26641e212094ecd93811cbead2 -Size (x264-snapshot-20140303-2245.tar.bz2) = 624932 bytes -SHA1 (patch-aa) = 8a8dd038925ea82b82ec9ada8293cccf3af2db87 -SHA1 (patch-ab) = ab27d32793b70a021850d774ef23724e97730dbf +SHA1 (x264-snapshot-20140809-2245.tar.bz2) = 368988a447a209d127458d70e35a5af495bf9346 +RMD160 (x264-snapshot-20140809-2245.tar.bz2) = 8eb5c54e96e12b9989891ea540b511bdd2c2b7aa +Size (x264-snapshot-20140809-2245.tar.bz2) = 628028 bytes +SHA1 (patch-aa) = 8aee03e966c5aeceaa643b7c23a26f2e40711bc5 +SHA1 (patch-ab) = f7b4dbe3b19f976182806619515b89cbabe51212 SHA1 (patch-ac) = e81a4c74cca30a0d3191817ada915fc956362509 SHA1 (patch-ba) = a8f12131e23953704361fb499b568f8f233c6be6 diff --git a/multimedia/x264-devel/patches/patch-aa b/multimedia/x264-devel/patches/patch-aa index 3bd1739daa5..b1b411bb35e 100644 --- a/multimedia/x264-devel/patches/patch-aa +++ b/multimedia/x264-devel/patches/patch-aa @@ -1,19 +1,8 @@ -$NetBSD: patch-aa,v 1.17 2014/03/04 13:59:11 adam Exp $ +$NetBSD: patch-aa,v 1.18 2014/08/10 15:39:15 adam Exp $ -Clang does not support -falign-loops option. - ---- configure.orig 2014-03-03 21:45:04.000000000 +0000 +--- configure.orig 2014-08-09 20:45:04.000000000 +0000 +++ configure -@@ -467,7 +467,7 @@ case $host_os in - ;; - darwin*) - SYS="MACOSX" -- CFLAGS="$CFLAGS -falign-loops=16" -+ CFLAGS="$CFLAGS" - libm="-lm" - if [ "$pic" = "no" ]; then - cc_check "" -mdynamic-no-pic && CFLAGS="$CFLAGS -mdynamic-no-pic" -@@ -477,6 +477,10 @@ case $host_os in +@@ -501,6 +501,10 @@ case $host_os in SYS="FREEBSD" libm="-lm" ;; @@ -24,7 +13,7 @@ Clang does not support -falign-loops option. kfreebsd*-gnu) SYS="FREEBSD" define HAVE_MALLOC_H -@@ -599,7 +603,7 @@ case $host_cpu in +@@ -623,7 +627,7 @@ case $host_cpu in ASFLAGS="$ASFLAGS -f elf" fi ;; @@ -32,8 +21,8 @@ Clang does not support -falign-loops option. + x86_64|amd64) ARCH="X86_64" AS="yasm" - [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS" -@@ -620,13 +624,14 @@ case $host_cpu in + ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/" +@@ -645,13 +649,14 @@ case $host_cpu in fi ;; powerpc|powerpc64) @@ -49,7 +38,7 @@ Clang does not support -falign-loops option. CFLAGS="$CFLAGS -maltivec -mabi=altivec" define HAVE_ALTIVEC_H fi -@@ -777,7 +782,7 @@ fi +@@ -785,7 +790,7 @@ fi # pthread-win32 is lgpl, prevent its use if --disable-gpl is specified and targeting windows [ "$SYS" = "WINDOWS" -a "$gpl" = "no" -a "$thread" = "auto" ] && thread="win32" @@ -58,7 +47,7 @@ Clang does not support -falign-loops option. if [ "$thread" = "auto" ]; then thread="no" case $SYS in -@@ -986,10 +991,11 @@ fi +@@ -999,10 +1004,11 @@ fi cc_check "stdint.h" "" "uint32_t test_vec __attribute__ ((vector_size (16))) = {0,1,2,3};" && define HAVE_VECTOREXT if [ "$pic" = "yes" ] ; then diff --git a/multimedia/x264-devel/patches/patch-ab b/multimedia/x264-devel/patches/patch-ab index 42de058c0d3..32617c04af7 100644 --- a/multimedia/x264-devel/patches/patch-ab +++ b/multimedia/x264-devel/patches/patch-ab @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.19 2014/03/04 13:59:11 adam Exp $ +$NetBSD: patch-ab,v 1.20 2014/08/10 15:39:15 adam Exp $ ---- Makefile.orig 2014-03-03 21:45:04.000000000 +0000 +--- Makefile.orig 2014-08-09 20:45:04.000000000 +0000 +++ Makefile -@@ -100,9 +100,9 @@ endif +@@ -97,9 +97,9 @@ endif + ifdef ARCH_X86 - ASFLAGS += -I$(SRCPATH)/common/x86/ SRCS += common/x86/mc-c.c common/x86/predict-c.c -OBJASM = $(ASMSRC:%.asm=%.o) +OBJASM = $(ASMSRC:%.asm=%.lo) @@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.19 2014/03/04 13:59:11 adam Exp $ endif endif -@@ -122,7 +122,7 @@ ASMSRC += common/arm/cpu-a.S common/arm/ +@@ -119,7 +119,7 @@ ASMSRC += common/arm/cpu-a.S common/arm/ common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \ common/arm/predict-a.S SRCS += common/arm/mc-c.c common/arm/predict-c.c @@ -23,16 +23,7 @@ $NetBSD: patch-ab,v 1.19 2014/03/04 13:59:11 adam Exp $ endif endif -@@ -130,7 +130,7 @@ endif - ifeq ($(ARCH),UltraSPARC) - ifeq ($(findstring HIGH_BIT_DEPTH, $(CONFIG)),) - ASMSRC += common/sparc/pixel.asm --OBJASM = $(ASMSRC:%.asm=%.o) -+OBJASM = $(ASMSRC:%.asm=%.lo) - endif - endif - -@@ -153,20 +153,23 @@ GENERATED += common/oclobj.h +@@ -142,20 +142,23 @@ GENERATED += common/oclobj.h SRCS += common/opencl.c encoder/slicetype-cl.c endif @@ -42,7 +33,7 @@ $NetBSD: patch-ab,v 1.19 2014/03/04 13:59:11 adam Exp $ +OBJCLI += $(SRCCLI:%.c=%.lo) OBJSO += $(SRCSO:%.c=%.o) - .PHONY: all default fprofiled clean distclean install uninstall lib-static lib-shared cli install-lib-dev install-lib-static install-lib-shared install-cli + .PHONY: all default fprofiled clean distclean install install-* uninstall cli lib-* etags +%.lo: %.c + ${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} ${PICFLAGS} -o $@ $< @@ -63,7 +54,7 @@ $NetBSD: patch-ab,v 1.19 2014/03/04 13:59:11 adam Exp $ $(SONAME): $(GENERATED) .depend $(OBJS) $(OBJASM) $(OBJSO) $(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS) -@@ -177,17 +180,17 @@ x264: x264$(EXE) +@@ -166,17 +169,16 @@ x264: x264$(EXE) checkasm: checkasm$(EXE) endif @@ -79,16 +70,15 @@ $NetBSD: patch-ab,v 1.19 2014/03/04 13:59:11 adam Exp $ $(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(OBJCHK): .depend --%.o: %.asm +-%.o: %.asm common/x86/x86inc.asm common/x86/x86util.asm - $(AS) $(ASFLAGS) -o $@ $< - -@ $(if $(STRIP), $(STRIP) -x $@) # delete local/anonymous symbols, so they don't show up in oprofile -+%.lo: %.asm -+ ${LIBTOOL} --mode=compile --tag=CC \ -+ ./strip_fopt.sh $(AS) $(ASFLAGS) -o $@ $< ++%.lo: %.asm common/x86/x86inc.asm common/x86/x86util.asm ++ ${LIBTOOL} --mode=compile --tag=CC ./strip_fopt.sh $(AS) $(ASFLAGS) -o $@ $< %.o: %.S $(AS) $(ASFLAGS) -o $@ $< -@@ -246,8 +249,7 @@ distclean: clean +@@ -245,8 +247,7 @@ distclean: clean rm -f config.mak x264_config.h config.h config.log x264.pc x264.def install-cli: cli @@ -98,7 +88,7 @@ $NetBSD: patch-ab,v 1.19 2014/03/04 13:59:11 adam Exp $ install-lib-dev: $(INSTALL) -d $(DESTDIR)$(includedir) -@@ -258,8 +260,7 @@ install-lib-dev: +@@ -257,8 +258,7 @@ install-lib-dev: $(INSTALL) -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig install-lib-static: lib-static install-lib-dev |