Sat Jul 18 11:08:22 2015 UTC ()
Changes:
* Update configure for auto detection of system libx264 configuration
* Add tile format frame packing value
* Stricter validation of crop-rect values
* Add mono frame packing value
* Validate frame packing value instead of clipping
* x86inc: Correctly warn on use of SSE2 instructions in SSE functions
* x86inc: Fix instantiation of YMM registers
* matroska: Correctly write display width and height in stereo mode
* Use POC type 0 for AVC-Intra
* Fix ARCH variable name conflict with BSD ports (bsd.port.mk) read-only variable
* Fix negative percentages in final stats output


(adam)
diff -r1.53 -r1.54 pkgsrc/multimedia/x264-devel/Makefile
diff -r1.36 -r1.37 pkgsrc/multimedia/x264-devel/distinfo
diff -r1.21 -r1.22 pkgsrc/multimedia/x264-devel/patches/patch-ab
cvs diff -r1.53 -r1.54 pkgsrc/multimedia/x264-devel/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/Attic/Makefile 2015/06/12 10:50:39 1.53
+++ pkgsrc/multimedia/x264-devel/Attic/Makefile 2015/07/18 11:08:21 1.54
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.53 2015/06/12 10:50:39 wiz Exp $ 1# $NetBSD: Makefile,v 1.54 2015/07/18 11:08:21 adam Exp $
2 2
3SNAPSHOT_DATE= 20141218 3SNAPSHOT_DATE= 20150717
4 4
5DISTNAME= x264-snapshot-${SNAPSHOT_DATE}-2245 5DISTNAME= x264-snapshot-${SNAPSHOT_DATE}-2245
6PKGNAME= x264-devel-${SNAPSHOT_DATE} 6PKGNAME= x264-devel-${SNAPSHOT_DATE}
7PKGREVISION= 1 
8CATEGORIES= multimedia 7CATEGORIES= multimedia
9MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ 8MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
10EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
11 10
12MAINTAINER= joerg@NetBSD.org 11MAINTAINER= joerg@NetBSD.org
13HOMEPAGE= http://www.videolan.org/developers/x264.html 12HOMEPAGE= http://www.videolan.org/developers/x264.html
14COMMENT= GPL licensed H.264 encoder 13COMMENT= GPL licensed H.264 encoder
15LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
16 15
17.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
18 17
19.if exists(/usr/include/stdlib.h) && ${OPSYS} != "Linux" # XXX should be fine 18.if exists(/usr/include/stdlib.h) && ${OPSYS} != "Linux" # XXX should be fine
20CFLAGS+= -DHAVE_STDLIB_H 19CFLAGS+= -DHAVE_STDLIB_H
cvs diff -r1.36 -r1.37 pkgsrc/multimedia/x264-devel/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/Attic/distinfo 2015/01/21 18:15:17 1.36
+++ pkgsrc/multimedia/x264-devel/Attic/distinfo 2015/07/18 11:08:21 1.37
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.36 2015/01/21 18:15:17 adam Exp $ 1$NetBSD: distinfo,v 1.37 2015/07/18 11:08:21 adam Exp $
2 2
3SHA1 (x264-snapshot-20141218-2245.tar.bz2) = 24a3b20e2c49a112e40df9f64885cbd81250298a 3SHA1 (x264-snapshot-20150717-2245.tar.bz2) = 491bfd031e4e4708173bacf4646098f22126c604
4RMD160 (x264-snapshot-20141218-2245.tar.bz2) = dda0759d0f8f2284618009cd6a8f296c034637ae 4RMD160 (x264-snapshot-20150717-2245.tar.bz2) = 3d5eb71c3dcf2bddcff53e3da355459b1a053a6c
5Size (x264-snapshot-20141218-2245.tar.bz2) = 652228 bytes 5Size (x264-snapshot-20150717-2245.tar.bz2) = 673063 bytes
6SHA1 (patch-aa) = cfb5c8f90548aa2ee2cdfadc34010033f2288258 6SHA1 (patch-aa) = cfb5c8f90548aa2ee2cdfadc34010033f2288258
7SHA1 (patch-ab) = e0cbdf86c506c3c3efa515099b544b918f25d254 7SHA1 (patch-ab) = c85db90485a397262bc4b0fea0d17075182ab3e3
8SHA1 (patch-ac) = e81a4c74cca30a0d3191817ada915fc956362509 8SHA1 (patch-ac) = e81a4c74cca30a0d3191817ada915fc956362509
9SHA1 (patch-ba) = a8f12131e23953704361fb499b568f8f233c6be6 9SHA1 (patch-ba) = a8f12131e23953704361fb499b568f8f233c6be6
cvs diff -r1.21 -r1.22 pkgsrc/multimedia/x264-devel/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/patches/Attic/patch-ab 2015/01/20 09:37:53 1.21
+++ pkgsrc/multimedia/x264-devel/patches/Attic/patch-ab 2015/07/18 11:08:22 1.22
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1$NetBSD: patch-ab,v 1.21 2015/01/20 09:37:53 wiz Exp $ 1$NetBSD: patch-ab,v 1.22 2015/07/18 11:08:22 adam Exp $
2 2
3--- Makefile.orig 2014-12-18 21:45:04.000000000 +0000 3--- Makefile.orig 2015-07-17 20:45:05.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -99,9 +99,9 @@ endif 5@@ -99,9 +99,9 @@ endif
6  6
7 ifdef ARCH_X86 7 ifdef ARCH_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@@ -121,7 +121,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@@ -159,20 +159,23 @@ GENERATED += common/oclobj.h 26@@ -162,20 +162,23 @@ GENERATED += common/oclobj.h
27 SRCS += common/opencl.c encoder/slicetype-cl.c 27 SRCS += common/opencl.c encoder/slicetype-cl.c
28 endif 28 endif
29  29
30-OBJS += $(SRCS:%.c=%.o) 30-OBJS += $(SRCS:%.c=%.o)
31-OBJCLI += $(SRCCLI:%.c=%.o) 31-OBJCLI += $(SRCCLI:%.c=%.o)
32+OBJS += $(SRCS:%.c=%.lo) 32+OBJS += $(SRCS:%.c=%.lo)
33+OBJCLI += $(SRCCLI:%.c=%.lo) 33+OBJCLI += $(SRCCLI:%.c=%.lo)
34 OBJSO += $(SRCSO:%.c=%.o) 34 OBJSO += $(SRCSO:%.c=%.o)
35  35
36 .PHONY: all default fprofiled clean distclean install install-* uninstall cli lib-* etags 36 .PHONY: all default fprofiled clean distclean install install-* uninstall cli lib-* etags
37  37
38+%.lo: %.c 38+%.lo: %.c
39+ ${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} ${PICFLAGS} -o $@ $< 39+ ${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} ${PICFLAGS} -o $@ $<
@@ -44,60 +44,60 @@ $NetBSD: patch-ab,v 1.21 2015/01/20 09:3 @@ -44,60 +44,60 @@ $NetBSD: patch-ab,v 1.21 2015/01/20 09:3
44 lib-shared: $(SONAME) 44 lib-shared: $(SONAME)
45  45
46-$(LIBX264): $(GENERATED) .depend $(OBJS) $(OBJASM) 46-$(LIBX264): $(GENERATED) .depend $(OBJS) $(OBJASM)
47- rm -f $(LIBX264) 47- rm -f $(LIBX264)
48- $(AR)$@ $(OBJS) $(OBJASM) 48- $(AR)$@ $(OBJS) $(OBJASM)
49- $(if $(RANLIB), $(RANLIB) $@) 49- $(if $(RANLIB), $(RANLIB) $@)
50+libx264.la: $(GENERATED) .depend $(OBJS) $(OBJASM) 50+libx264.la: $(GENERATED) .depend $(OBJS) $(OBJASM)
51+ ${LIBTOOL} --mode=link \ 51+ ${LIBTOOL} --mode=link \
52+ ${CC} -o libx264.la -rpath ${PREFIX}/lib -version-info 0 \ 52+ ${CC} -o libx264.la -rpath ${PREFIX}/lib -version-info 0 \
53+ $(OBJS) $(OBJASM) ${LDFLAGS} 53+ $(OBJS) $(OBJASM) ${LDFLAGS}
54  54
55 $(SONAME): $(GENERATED) .depend $(OBJS) $(OBJASM) $(OBJSO) 55 $(SONAME): $(GENERATED) .depend $(OBJS) $(OBJASM) $(OBJSO)
56 $(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS) 56 $(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
57@@ -184,20 +187,19 @@ checkasm: checkasm$(EXE) 57@@ -187,20 +190,19 @@ checkasm: checkasm$(EXE)
58 example: example$(EXE) 58 example: example$(EXE)
59 endif 59 endif
60  60
61-x264$(EXE): $(GENERATED) .depend $(OBJCLI) $(CLI_LIBX264) 61-x264$(EXE): $(GENERATED) .depend $(OBJCLI) $(CLI_LIBX264)
62- $(LD)$@ $(OBJCLI) $(CLI_LIBX264) $(LDFLAGSCLI) $(LDFLAGS) 62- $(LD)$@ $(OBJCLI) $(CLI_LIBX264) $(LDFLAGSCLI) $(LDFLAGS)
63+x264$(EXE): $(GENERATED) .depend $(OBJCLI) libx264.la 63+x264$(EXE): $(GENERATED) .depend $(OBJCLI) libx264.la
64+ ${LIBTOOL} --mode=link $(LD)$@ $(OBJCLI) libx264.la $(LDFLAGSCLI) $(LDFLAGS) 64+ ${LIBTOOL} --mode=link $(LD)$@ $(OBJCLI) libx264.la $(LDFLAGSCLI) $(LDFLAGS)
65  65
66-checkasm$(EXE): $(GENERATED) .depend $(OBJCHK) $(LIBX264) 66-checkasm$(EXE): $(GENERATED) .depend $(OBJCHK) $(LIBX264)
67- $(LD)$@ $(OBJCHK) $(LIBX264) $(LDFLAGS) 67- $(LD)$@ $(OBJCHK) $(LIBX264) $(LDFLAGS)
68+checkasm$(EXE): $(GENERATED) .depend $(OBJCHK) libx264.la 68+checkasm$(EXE): $(GENERATED) .depend $(OBJCHK) libx264.la
69+ ${LIBTOOL} --mode=link $(LD)$@ $+ $(LDFLAGS) 69+ ${LIBTOOL} --mode=link $(LD)$@ $+ $(LDFLAGS)
70  70
71 example$(EXE): $(GENERATED) .depend $(OBJEXAMPLE) $(LIBX264) 71 example$(EXE): $(GENERATED) .depend $(OBJEXAMPLE) $(LIBX264)
72 $(LD)$@ $(OBJEXAMPLE) $(LIBX264) $(LDFLAGS) 72 $(LD)$@ $(OBJEXAMPLE) $(LIBX264) $(LDFLAGS)
73  73
74 $(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(OBJCHK) $(OBJEXAMPLE): .depend 74 $(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(OBJCHK) $(OBJEXAMPLE): .depend
75  75
76-%.o: %.asm common/x86/x86inc.asm common/x86/x86util.asm 76-%.o: %.asm common/x86/x86inc.asm common/x86/x86util.asm
77- $(AS) $(ASFLAGS) -o $@ $< 77- $(AS) $(ASFLAGS) -o $@ $<
78- -@ $(if $(STRIP), $(STRIP) -x $@) # delete local/anonymous symbols, so they don't show up in oprofile 78- -@ $(if $(STRIP), $(STRIP) -x $@) # delete local/anonymous symbols, so they don't show up in oprofile
79+%.lo: %.asm common/x86/x86inc.asm common/x86/x86util.asm 79+%.lo: %.asm common/x86/x86inc.asm common/x86/x86util.asm
80+ ${LIBTOOL} --mode=compile --tag=CC ./strip_fopt.sh $(AS) $(ASFLAGS) -o $@ $< 80+ ${LIBTOOL} --mode=compile --tag=CC ./strip_fopt.sh $(AS) $(ASFLAGS) -o $@ $<
81  81
82 %.o: %.S 82 %.o: %.S
83 $(AS) $(ASFLAGS) -o $@ $< 83 $(AS) $(ASFLAGS) -o $@ $<
84@@ -267,8 +269,7 @@ distclean: clean 84@@ -270,8 +272,7 @@ distclean: clean
85 rm -f config.mak x264_config.h config.h config.log x264.pc x264.def 85 rm -f config.mak x264_config.h config.h config.log x264.pc x264.def conftest*
86  86
87 install-cli: cli 87 install-cli: cli
88- $(INSTALL) -d $(DESTDIR)$(bindir) 88- $(INSTALL) -d $(DESTDIR)$(bindir)
89- $(INSTALL) x264$(EXE) $(DESTDIR)$(bindir) 89- $(INSTALL) x264$(EXE) $(DESTDIR)$(bindir)
90+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} x264 $(DESTDIR)$(bindir)/x264 90+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} x264 $(DESTDIR)$(bindir)/x264
91  91
92 install-lib-dev: 92 install-lib-dev:
93 $(INSTALL) -d $(DESTDIR)$(includedir) 93 $(INSTALL) -d $(DESTDIR)$(includedir)
94@@ -279,8 +280,7 @@ install-lib-dev: 94@@ -282,8 +283,7 @@ install-lib-dev:
95 $(INSTALL) -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig 95 $(INSTALL) -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
96  96
97 install-lib-static: lib-static install-lib-dev 97 install-lib-static: lib-static install-lib-dev
98- $(INSTALL) -m 644 $(LIBX264) $(DESTDIR)$(libdir) 98- $(INSTALL) -m 644 $(LIBX264) $(DESTDIR)$(libdir)
99- $(if $(RANLIB), $(RANLIB) $(DESTDIR)$(libdir)/$(LIBX264)) 99- $(if $(RANLIB), $(RANLIB) $(DESTDIR)$(libdir)/$(LIBX264))
100+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libx264.la $(DESTDIR)$(libdir) 100+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libx264.la $(DESTDIR)$(libdir)
101  101
102 install-lib-shared: lib-shared install-lib-dev 102 install-lib-shared: lib-shared install-lib-dev
103 ifneq ($(IMPLIBNAME),) 103 ifneq ($(IMPLIBNAME),)