Thu Jul 4 16:43:55 2013 UTC ()
Update to 20130703 snapshot: speedups, opencl support (disabled in pkgsrc).


(wiz)
diff -r1.41 -r1.42 pkgsrc/multimedia/x264-devel/Makefile
diff -r1.29 -r1.30 pkgsrc/multimedia/x264-devel/distinfo
diff -r1.17 -r1.18 pkgsrc/multimedia/x264-devel/patches/patch-ab
cvs diff -r1.41 -r1.42 pkgsrc/multimedia/x264-devel/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/Attic/Makefile 2013/05/10 05:39:20 1.41
+++ pkgsrc/multimedia/x264-devel/Attic/Makefile 2013/07/04 16:43:55 1.42
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.41 2013/05/10 05:39:20 riastradh Exp $ 1# $NetBSD: Makefile,v 1.42 2013/07/04 16:43:55 wiz Exp $
2 2
3SNAPSHOT_DATE= 20130115 3SNAPSHOT_DATE= 20130703
4 4
5DISTNAME= x264-snapshot-${SNAPSHOT_DATE}-2245 5DISTNAME= x264-snapshot-${SNAPSHOT_DATE}-2245
6PKGNAME= x264-devel-${SNAPSHOT_DATE} 6PKGNAME= x264-devel-${SNAPSHOT_DATE}
7CATEGORIES= multimedia 7CATEGORIES= multimedia
8MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ 8MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= joerg@NetBSD.org 11MAINTAINER= joerg@NetBSD.org
12HOMEPAGE= http://www.videolan.org/developers/x264.html 12HOMEPAGE= http://www.videolan.org/developers/x264.html
13COMMENT= GPL licensed H.264 encoder 13COMMENT= GPL licensed H.264 encoder
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
15 15
16.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
@@ -40,26 +40,27 @@ BUILD_DEPENDS+= yasm>=0.4.0:../../devel @@ -40,26 +40,27 @@ BUILD_DEPENDS+= yasm>=0.4.0:../../devel
40. endif 40. endif
41.elif ${MACHINE_ARCH} == "arm" && ${OPSYS} == "NetBSD" 41.elif ${MACHINE_ARCH} == "arm" && ${OPSYS} == "NetBSD"
42# pre-ARMv6 is default on NetBSD/arm 42# pre-ARMv6 is default on NetBSD/arm
43CONFIGURE_ARGS+= --disable-asm 43CONFIGURE_ARGS+= --disable-asm
44.endif 44.endif
45 45
46USE_TOOLS+= gmake bash 46USE_TOOLS+= gmake bash
47USE_LIBTOOL= yes 47USE_LIBTOOL= yes
48 48
49HAS_CONFIGURE= yes 49HAS_CONFIGURE= yes
50CONFIG_SHELL= ${BASH} 50CONFIG_SHELL= ${BASH}
51CONFIGURE_ARGS+= --enable-pic # uses libtool's -prefer-pic 51CONFIGURE_ARGS+= --enable-pic # uses libtool's -prefer-pic
52CONFIGURE_ARGS+= --prefix=${PREFIX} 52CONFIGURE_ARGS+= --prefix=${PREFIX}
 53CONFIGURE_ARGS+= --disable-opencl
53MAKE_ENV+= SH=${SH:Q} 54MAKE_ENV+= SH=${SH:Q}
54 55
55.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 56.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
56# XXX Consider passing this whether cross-compiling or not. 57# XXX Consider passing this whether cross-compiling or not.
57CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q} 58CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q}
58.endif 59.endif
59 60
60BUILD_TARGET= default 61BUILD_TARGET= default
61INSTALL_TARGET= install-lib-static install-cli 62INSTALL_TARGET= install-lib-static install-cli
62INSTALLATION_DIRS= bin 63INSTALLATION_DIRS= bin
63BUILDLINK_TRANSFORM+= rm:-O4 # XXX does this mean anything to any compiler? 64BUILDLINK_TRANSFORM+= rm:-O4 # XXX does this mean anything to any compiler?
64REPLACE_SH= strip_fopt.sh version.sh 65REPLACE_SH= strip_fopt.sh version.sh
65 66
cvs diff -r1.29 -r1.30 pkgsrc/multimedia/x264-devel/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/Attic/distinfo 2013/01/16 20:55:30 1.29
+++ pkgsrc/multimedia/x264-devel/Attic/distinfo 2013/07/04 16:43:55 1.30
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.29 2013/01/16 20:55:30 adam Exp $ 1$NetBSD: distinfo,v 1.30 2013/07/04 16:43:55 wiz Exp $
2 2
3SHA1 (x264-snapshot-20130115-2245.tar.bz2) = 6e418f56200b12e4c4a99738a7db4ef4e35d3040 3SHA1 (x264-snapshot-20130703-2245.tar.bz2) = 3c343f0957451e98cb695877e82fd4eae024e74c
4RMD160 (x264-snapshot-20130115-2245.tar.bz2) = 048551b58268d837957fe323517b0dc05f6588b9 4RMD160 (x264-snapshot-20130703-2245.tar.bz2) = 7066bc12c454c615879af09a7ab5b801093d514f
5Size (x264-snapshot-20130115-2245.tar.bz2) = 558202 bytes 5Size (x264-snapshot-20130703-2245.tar.bz2) = 624809 bytes
6SHA1 (patch-aa) = bf070b45b4868abdb08c4b9849937c970e6b1311 6SHA1 (patch-aa) = bf070b45b4868abdb08c4b9849937c970e6b1311
7SHA1 (patch-ab) = 796b817a9ad056fea3ccb87c051701653c78f913 7SHA1 (patch-ab) = 5a7e8fc1a25fe3146bea66f835b6fa17bf4c16f9
8SHA1 (patch-ac) = 42aaa1f91cd87923442d23ff222e1b37ed43948b 8SHA1 (patch-ac) = 42aaa1f91cd87923442d23ff222e1b37ed43948b
9SHA1 (patch-ak) = bb73c847d6f7be5cee2eee1d77060b5633e5dfc2 9SHA1 (patch-ak) = bb73c847d6f7be5cee2eee1d77060b5633e5dfc2
10SHA1 (patch-ba) = a8f12131e23953704361fb499b568f8f233c6be6 10SHA1 (patch-ba) = a8f12131e23953704361fb499b568f8f233c6be6
cvs diff -r1.17 -r1.18 pkgsrc/multimedia/x264-devel/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/patches/Attic/patch-ab 2012/11/08 20:28:09 1.17
+++ pkgsrc/multimedia/x264-devel/patches/Attic/patch-ab 2013/07/04 16:43:55 1.18
@@ -1,110 +1,110 @@ @@ -1,110 +1,110 @@
1$NetBSD: patch-ab,v 1.17 2012/11/08 20:28:09 adam Exp $ 1$NetBSD: patch-ab,v 1.18 2013/07/04 16:43:55 wiz Exp $
2 2
3--- Makefile.orig 2012-11-07 21:45:03.000000000 +0000 3--- Makefile.orig 2013-07-03 20:45:03.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -99,9 +99,9 @@ endif 5@@ -101,9 +101,9 @@ endif
6 ifdef ARCH_X86 6 ifdef ARCH_X86
7 ASFLAGS += -I$(SRCPATH)/common/x86/ 7 ASFLAGS += -I$(SRCPATH)/common/x86/
8 SRCS += common/x86/mc-c.c common/x86/predict-c.c 8 SRCS += common/x86/mc-c.c common/x86/predict-c.c
9-OBJASM = $(ASMSRC:%.asm=%.o) 9-OBJASM = $(ASMSRC:%.asm=%.o)
10+OBJASM = $(ASMSRC:%.asm=%.lo) 10+OBJASM = $(ASMSRC:%.asm=%.lo)
11 $(OBJASM): common/x86/x86inc.asm common/x86/x86util.asm 11 $(OBJASM): common/x86/x86inc.asm common/x86/x86util.asm
12-OBJCHK += tools/checkasm-a.o 12-OBJCHK += tools/checkasm-a.o
13+OBJCHK += tools/checkasm-a.lo 13+OBJCHK += tools/checkasm-a.lo
14 endif 14 endif
15 endif 15 endif
16  16
17@@ -121,7 +121,7 @@ ASMSRC += common/arm/cpu-a.S common/arm/ 17@@ -123,7 +123,7 @@ ASMSRC += common/arm/cpu-a.S common/arm/
18 common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \ 18 common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \
19 common/arm/predict-a.S 19 common/arm/predict-a.S
20 SRCS += common/arm/mc-c.c common/arm/predict-c.c 20 SRCS += common/arm/mc-c.c common/arm/predict-c.c
21-OBJASM = $(ASMSRC:%.S=%.o) 21-OBJASM = $(ASMSRC:%.S=%.o)
22+OBJASM = $(ASMSRC:%.S=%.lo) 22+OBJASM = $(ASMSRC:%.S=%.lo)
23 endif 23 endif
24 endif 24 endif
25  25
26@@ -129,7 +129,7 @@ endif 26@@ -131,7 +131,7 @@ endif
27 ifeq ($(ARCH),UltraSPARC) 27 ifeq ($(ARCH),UltraSPARC)
28 ifeq ($(findstring HIGH_BIT_DEPTH, $(CONFIG)),) 28 ifeq ($(findstring HIGH_BIT_DEPTH, $(CONFIG)),)
29 ASMSRC += common/sparc/pixel.asm 29 ASMSRC += common/sparc/pixel.asm
30-OBJASM = $(ASMSRC:%.asm=%.o) 30-OBJASM = $(ASMSRC:%.asm=%.o)
31+OBJASM = $(ASMSRC:%.asm=%.lo) 31+OBJASM = $(ASMSRC:%.asm=%.lo)
32 endif 32 endif
33 endif 33 endif
34  34
35@@ -145,20 +145,23 @@ OBJSO += $(if $(RC), x264res.dll.o) 35@@ -154,20 +154,23 @@ GENERATED += common/oclobj.h
36 endif 36 SRCS += common/opencl.c encoder/slicetype-cl.c
37 endif 37 endif
38  38
39-OBJS += $(SRCS:%.c=%.o) 39-OBJS += $(SRCS:%.c=%.o)
40-OBJCLI += $(SRCCLI:%.c=%.o) 40-OBJCLI += $(SRCCLI:%.c=%.o)
41+OBJS += $(SRCS:%.c=%.lo) 41+OBJS += $(SRCS:%.c=%.lo)
42+OBJCLI += $(SRCCLI:%.c=%.lo) 42+OBJCLI += $(SRCCLI:%.c=%.lo)
43 OBJSO += $(SRCSO:%.c=%.o) 43 OBJSO += $(SRCSO:%.c=%.o)
44  44
45 .PHONY: all default fprofiled clean distclean install uninstall lib-static lib-shared cli install-lib-dev install-lib-static install-lib-shared install-cli 45 .PHONY: all default fprofiled clean distclean install uninstall lib-static lib-shared cli install-lib-dev install-lib-static install-lib-shared install-cli
46  46
47+%.lo: %.c 47+%.lo: %.c
48+ ${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} ${PICFLAGS} -o $@ $< 48+ ${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} ${PICFLAGS} -o $@ $<
49+ 49+
50 cli: x264$(EXE) 50 cli: x264$(EXE)
51-lib-static: $(LIBX264) 51-lib-static: $(LIBX264)
52+lib-static: libx264.la 52+lib-static: libx264.la
53 lib-shared: $(SONAME) 53 lib-shared: $(SONAME)
54  54
55-$(LIBX264): .depend $(OBJS) $(OBJASM) 55-$(LIBX264): $(GENERATED) .depend $(OBJS) $(OBJASM)
56- rm -f $(LIBX264) 56- rm -f $(LIBX264)
57- $(AR)$@ $(OBJS) $(OBJASM) 57- $(AR)$@ $(OBJS) $(OBJASM)
58- $(if $(RANLIB), $(RANLIB) $@) 58- $(if $(RANLIB), $(RANLIB) $@)
59+libx264.la: .depend $(OBJS) $(OBJASM) 59+libx264.la: $(GENERATED) .depend $(OBJS) $(OBJASM)
60+ ${LIBTOOL} --mode=link \ 60+ ${LIBTOOL} --mode=link \
61+ ${CC} -o libx264.la -rpath ${PREFIX}/lib -version-info 0 \ 61+ ${CC} -o libx264.la -rpath ${PREFIX}/lib -version-info 0 \
62+ $(OBJS) $(OBJASM) ${LDFLAGS} 62+ $(OBJS) $(OBJASM) ${LDFLAGS}
63  63
64 $(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO) 64 $(SONAME): $(GENERATED) .depend $(OBJS) $(OBJASM) $(OBJSO)
65 $(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS) 65 $(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
66@@ -169,17 +172,17 @@ x264: x264$(EXE) 66@@ -178,17 +181,17 @@ x264: x264$(EXE)
67 checkasm: checkasm$(EXE) 67 checkasm: checkasm$(EXE)
68 endif 68 endif
69  69
70-x264$(EXE): .depend $(OBJCLI) $(CLI_LIBX264) 70-x264$(EXE): $(GENERATED) .depend $(OBJCLI) $(CLI_LIBX264)
71- $(LD)$@ $(OBJCLI) $(CLI_LIBX264) $(LDFLAGSCLI) $(LDFLAGS) 71- $(LD)$@ $(OBJCLI) $(CLI_LIBX264) $(LDFLAGSCLI) $(LDFLAGS)
72+x264$(EXE): .depend $(OBJCLI) libx264.la 72+x264$(EXE): $(GENERATED) .depend $(OBJCLI) libx264.la
73+ ${LIBTOOL} --mode=link $(LD)$@ $(OBJCLI) libx264.la $(LDFLAGSCLI) $(LDFLAGS) 73+ ${LIBTOOL} --mode=link $(LD)$@ $(OBJCLI) libx264.la $(LDFLAGSCLI) $(LDFLAGS)
74  74
75-checkasm$(EXE): .depend $(OBJCHK) $(LIBX264) 75-checkasm$(EXE): $(GENERATED) .depend $(OBJCHK) $(LIBX264)
76- $(LD)$@ $(OBJCHK) $(LIBX264) $(LDFLAGS) 76- $(LD)$@ $(OBJCHK) $(LIBX264) $(LDFLAGS)
77+checkasm$(EXE): .depend $(OBJCHK) libx264.la 77+checkasm$(EXE): $(GENERATED) .depend $(OBJCHK) libx264.la
78+ ${LIBTOOL} --mode=link $(LD)$@ $+ $(LDFLAGS) 78+ ${LIBTOOL} --mode=link $(LD)$@ $+ $(LDFLAGS)
79  79
80 $(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(OBJCHK): .depend 80 $(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(OBJCHK): .depend
81  81
82-%.o: %.asm 82-%.o: %.asm
83- $(AS) $(ASFLAGS) -o $@ $< 83- $(AS) $(ASFLAGS) -o $@ $<
84- -@ $(if $(STRIP), $(STRIP) -x $@) # delete local/anonymous symbols, so they don't show up in oprofile 84- -@ $(if $(STRIP), $(STRIP) -x $@) # delete local/anonymous symbols, so they don't show up in oprofile
85+%.lo: %.asm 85+%.lo: %.asm
86+ ${LIBTOOL} --mode=compile --tag=CC \ 86+ ${LIBTOOL} --mode=compile --tag=CC \
87+ ./strip_fopt.sh $(AS) $(ASFLAGS) -o $@ $< 87+ ./strip_fopt.sh $(AS) $(ASFLAGS) -o $@ $<
88  88
89 %.o: %.S 89 %.o: %.S
90 $(AS) $(ASFLAGS) -o $@ $< 90 $(AS) $(ASFLAGS) -o $@ $<
91@@ -238,8 +241,7 @@ distclean: clean 91@@ -247,8 +250,7 @@ distclean: clean
92 rm -f config.mak x264_config.h config.h config.log x264.pc x264.def 92 rm -f config.mak x264_config.h config.h config.log x264.pc x264.def
93  93
94 install-cli: cli 94 install-cli: cli
95- install -d $(DESTDIR)$(bindir) 95- install -d $(DESTDIR)$(bindir)
96- install x264$(EXE) $(DESTDIR)$(bindir) 96- install x264$(EXE) $(DESTDIR)$(bindir)
97+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} x264 $(DESTDIR)$(bindir)/x264 97+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} x264 $(DESTDIR)$(bindir)/x264
98  98
99 install-lib-dev: 99 install-lib-dev:
100 install -d $(DESTDIR)$(includedir) 100 install -d $(DESTDIR)$(includedir)
101@@ -250,8 +252,7 @@ install-lib-dev: 101@@ -259,8 +261,7 @@ install-lib-dev:
102 install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig 102 install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
103  103
104 install-lib-static: lib-static install-lib-dev 104 install-lib-static: lib-static install-lib-dev
105- install -m 644 $(LIBX264) $(DESTDIR)$(libdir) 105- install -m 644 $(LIBX264) $(DESTDIR)$(libdir)
106- $(if $(RANLIB), $(RANLIB) $(DESTDIR)$(libdir)/$(LIBX264)) 106- $(if $(RANLIB), $(RANLIB) $(DESTDIR)$(libdir)/$(LIBX264))
107+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libx264.la $(DESTDIR)$(libdir) 107+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libx264.la $(DESTDIR)$(libdir)
108  108
109 install-lib-shared: lib-shared install-lib-dev 109 install-lib-shared: lib-shared install-lib-dev
110 ifneq ($(IMPLIBNAME),) 110 ifneq ($(IMPLIBNAME),)