Update to 20141218, the latest available snapshot. Does anyone know why

there are no newer ones?

3 files changed, 20 insertions, 17 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index 8c89841e775..24219b24396 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2014/10/24 10:20:43 adam Exp $
+# $NetBSD: Makefile,v 1.51 2015/01/20 09:37:53 wiz Exp $
 
-SNAPSHOT_DATE=	20141023
+SNAPSHOT_DATE=	20141218
 
 DISTNAME=	x264-snapshot-${SNAPSHOT_DATE}-2245
 PKGNAME=	x264-devel-${SNAPSHOT_DATE}
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 0107550583b..884ddb36eea 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.34 2014/10/24 10:20:43 adam Exp $
+$NetBSD: distinfo,v 1.35 2015/01/20 09:37:53 wiz Exp $
 
-SHA1 (x264-snapshot-20141023-2245.tar.bz2) = 42512d0b4210fba6610640befa75aa21f03034d3
-RMD160 (x264-snapshot-20141023-2245.tar.bz2) = 58be4fc4d8fe94b86407f3036fbf64652cb316fc
-Size (x264-snapshot-20141023-2245.tar.bz2) = 650863 bytes
+SHA1 (x264-snapshot-20141218-2245.tar.bz2) = 24a3b20e2c49a112e40df9f64885cbd81250298a
+RMD160 (x264-snapshot-20141218-2245.tar.bz2) = dda0759d0f8f2284618009cd6a8f296c034637ae
+Size (x264-snapshot-20141218-2245.tar.bz2) = 652228 bytes
 SHA1 (patch-aa) = 816592309007dbd1d7be002613503733dff133d2
-SHA1 (patch-ab) = f7b4dbe3b19f976182806619515b89cbabe51212
+SHA1 (patch-ab) = e0cbdf86c506c3c3efa515099b544b918f25d254
 SHA1 (patch-ac) = e81a4c74cca30a0d3191817ada915fc956362509
 SHA1 (patch-ba) = a8f12131e23953704361fb499b568f8f233c6be6
diff --git a/multimedia/x264-devel/patches/patch-ab b/multimedia/x264-devel/patches/patch-ab
index 32617c04af7..19572efef1f 100644
--- a/multimedia/x264-devel/patches/patch-ab
+++ b/multimedia/x264-devel/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.20 2014/08/10 15:39:15 adam Exp $
+$NetBSD: patch-ab,v 1.21 2015/01/20 09:37:53 wiz Exp $
 
---- Makefile.orig	2014-08-09 20:45:04.000000000 +0000
+--- Makefile.orig	2014-12-18 21:45:04.000000000 +0000
 +++ Makefile
-@@ -97,9 +97,9 @@ endif
+@@ -99,9 +99,9 @@ endif
  
  ifdef ARCH_X86
  SRCS   += common/x86/mc-c.c common/x86/predict-c.c
@@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.20 2014/08/10 15:39:15 adam Exp $
  endif
  endif
  
-@@ -119,7 +119,7 @@ ASMSRC += common/arm/cpu-a.S common/arm/
+@@ -121,7 +121,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,7 +23,7 @@ $NetBSD: patch-ab,v 1.20 2014/08/10 15:39:15 adam Exp $
  endif
  endif
  
-@@ -142,20 +142,23 @@ GENERATED += common/oclobj.h
+@@ -159,20 +159,23 @@ GENERATED += common/oclobj.h
  SRCS += common/opencl.c encoder/slicetype-cl.c
  endif
  
@@ -54,8 +54,8 @@ $NetBSD: patch-ab,v 1.20 2014/08/10 15:39:15 adam Exp $
  
  $(SONAME): $(GENERATED) .depend $(OBJS) $(OBJASM) $(OBJSO)
  	$(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
-@@ -166,17 +169,16 @@ x264: x264$(EXE)
- checkasm: checkasm$(EXE)
+@@ -184,20 +187,19 @@ checkasm: checkasm$(EXE)
+ example: example$(EXE)
  endif
  
 -x264$(EXE): $(GENERATED) .depend $(OBJCLI) $(CLI_LIBX264)
@@ -68,7 +68,10 @@ $NetBSD: patch-ab,v 1.20 2014/08/10 15:39:15 adam Exp $
 +checkasm$(EXE): $(GENERATED) .depend $(OBJCHK) libx264.la
 +	${LIBTOOL} --mode=link $(LD)$@ $+ $(LDFLAGS)
  
- $(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(OBJCHK): .depend
+ example$(EXE): $(GENERATED) .depend $(OBJEXAMPLE) $(LIBX264)
+ 	$(LD)$@ $(OBJEXAMPLE) $(LIBX264) $(LDFLAGS)
+ 
+ $(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(OBJCHK) $(OBJEXAMPLE): .depend
  
 -%.o: %.asm common/x86/x86inc.asm common/x86/x86util.asm
 -	$(AS) $(ASFLAGS) -o $@ $<
@@ -78,7 +81,7 @@ $NetBSD: patch-ab,v 1.20 2014/08/10 15:39:15 adam Exp $
  
  %.o: %.S
  	$(AS) $(ASFLAGS) -o $@ $<
-@@ -245,8 +247,7 @@ distclean: clean
+@@ -267,8 +269,7 @@ distclean: clean
  	rm -f config.mak x264_config.h config.h config.log x264.pc x264.def
  
  install-cli: cli
@@ -88,7 +91,7 @@ $NetBSD: patch-ab,v 1.20 2014/08/10 15:39:15 adam Exp $
  
  install-lib-dev:
  	$(INSTALL) -d $(DESTDIR)$(includedir)
-@@ -257,8 +258,7 @@ install-lib-dev:
+@@ -279,8 +280,7 @@ install-lib-dev:
  	$(INSTALL) -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
  
  install-lib-static: lib-static install-lib-dev