[pkgsrc/trunk]: pkgsrc/multimedia/x264-devel Changes 20121107:

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fc15a26bd992
branches:  trunk
changeset: 610864:fc15a26bd992
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Nov 08 19:55:56 2012 +0000

description:
Changes 20121107:
This is another snapshot.

diffstat:

 multimedia/x264-devel/Makefile         |  29 ++++++++++++++---------------
 multimedia/x264-devel/buildlink3.mk    |   5 +++--
 multimedia/x264-devel/distinfo         |  18 +++++++++---------
 multimedia/x264-devel/patches/patch-aa |  16 ++++++++--------
 multimedia/x264-devel/patches/patch-ab |  33 +++++++++++++++------------------
 multimedia/x264-devel/patches/patch-ac |  10 +++++-----
 multimedia/x264-devel/patches/patch-ak |   6 +++---
 multimedia/x264-devel/patches/patch-ba |   4 ++--
 8 files changed, 59 insertions(+), 62 deletions(-)

diffs (294 lines):

diff -r 223217ee1f3a -r fc15a26bd992 multimedia/x264-devel/Makefile
--- a/multimedia/x264-devel/Makefile    Thu Nov 08 19:27:27 2012 +0000
+++ b/multimedia/x264-devel/Makefile    Thu Nov 08 19:55:56 2012 +0000
@@ -1,20 +1,21 @@
-# $NetBSD: Makefile,v 1.35 2012/10/08 09:21:14 asau Exp $
+# $NetBSD: Makefile,v 1.36 2012/11/08 19:55:56 adam Exp $
 
-SNAPSHOT_DATE=         20111207
+SNAPSHOT_DATE= 20121107
 
-DISTNAME=              x264-snapshot-${SNAPSHOT_DATE}-2245
-PKGNAME=               x264-devel-${SNAPSHOT_DATE}
-CATEGORIES=            multimedia
-MASTER_SITES=          ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
-EXTRACT_SUFX=          .tar.bz2
+DISTNAME=      x264-snapshot-${SNAPSHOT_DATE}-2245
+PKGNAME=       x264-devel-${SNAPSHOT_DATE}
+CATEGORIES=    multimedia
+MASTER_SITES=  ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
+EXTRACT_SUFX=  .tar.bz2
 
-MAINTAINER=            joerg%NetBSD.org@localhost
-HOMEPAGE=              http://www.videolan.org/developers/x264.html
-COMMENT=               GPL licensed H.264 encoder
+MAINTAINER=    joerg%NetBSD.org@localhost
+HOMEPAGE=      http://www.videolan.org/developers/x264.html
+COMMENT=       GPL licensed H.264 encoder
+LICENSE=       gnu-gpl-v2
 
 .include "../../mk/bsd.prefs.mk"
 
-.if exists(/usr/include/stdlib.h) && ${OPSYS} != Linux # XXX should be fine
+.if exists(/usr/include/stdlib.h) && ${OPSYS} != "Linux" # XXX should be fine
 CFLAGS+=       -DHAVE_STDLIB_H
 .endif
 
@@ -24,16 +25,14 @@
 # them off even if the C versions are slower.
 .if ${MACHINE_ARCH} == "i386"
 .  if ${OPSYS} == "SunOS" || (${OPSYS} == "NetBSD" && \
-       (!empty(OS_VERSION:M[1-5].*) && empty(OS_VERSION:M5.99.*))) || \
-      ${OPSYS} == "Darwin"
+       (!empty(OS_VERSION:M[1-5].*) && empty(OS_VERSION:M5.99.*)))
 CONFIGURE_ARGS+=       --disable-asm
 .  else
 BUILD_DEPENDS+=                yasm>=0.4.0:../../devel/yasm
 .  endif
 .elif ${MACHINE_ARCH} == "x86_64"
 .  if ${OPSYS} == "SunOS" || (${OPSYS} == "NetBSD" && \
-       (!empty(OS_VERSION:M[1-5].*) && empty(OS_VERSION:M5.99.*))) || \
-      ${OPSYS} == "Darwin"
+       (!empty(OS_VERSION:M[1-5].*) && empty(OS_VERSION:M5.99.*)))
 CONFIGURE_ARGS+=       --disable-asm
 .  else
 BUILD_DEPENDS+=                yasm>=0.4.0:../../devel/yasm
diff -r 223217ee1f3a -r fc15a26bd992 multimedia/x264-devel/buildlink3.mk
--- a/multimedia/x264-devel/buildlink3.mk       Thu Nov 08 19:27:27 2012 +0000
+++ b/multimedia/x264-devel/buildlink3.mk       Thu Nov 08 19:55:56 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2011/01/17 16:46:42 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2012/11/08 19:55:56 adam Exp $
 
 BUILDLINK_TREE+=       x264-devel
 
@@ -13,8 +13,9 @@
 ###
 ###      Prior specification: x264-devel>=20060127 # X264_BUILD 44
 ###      Prior specification: x264-devel>=20081217 # X264_BUILD 65
+###      Prior specification: x264-devel>=20110101 # X264_BUILD 112
 ###
-BUILDLINK_API_DEPENDS.x264-devel+=     x264-devel>=20110101 # X264_BUILD 112
+BUILDLINK_API_DEPENDS.x264-devel+=     x264-devel>=20121107 # X264_BUILD 128
 BUILDLINK_PKGSRCDIR.x264-devel?=       ../../multimedia/x264-devel
 pkgbase:= x264-devel
 .  include "../../mk/pkg-build-options.mk"
diff -r 223217ee1f3a -r fc15a26bd992 multimedia/x264-devel/distinfo
--- a/multimedia/x264-devel/distinfo    Thu Nov 08 19:27:27 2012 +0000
+++ b/multimedia/x264-devel/distinfo    Thu Nov 08 19:55:56 2012 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.25 2012/01/16 11:06:05 drochner Exp $
+$NetBSD: distinfo,v 1.26 2012/11/08 19:55:56 adam Exp $
 
-SHA1 (x264-snapshot-20111207-2245.tar.bz2) = 33e0e44e636f8a7d2c2de4e7bac855d5db6a3b1e
-RMD160 (x264-snapshot-20111207-2245.tar.bz2) = bf429f9279029c3ad99cafe0551e1f5aedf5f92f
-Size (x264-snapshot-20111207-2245.tar.bz2) = 532952 bytes
-SHA1 (patch-aa) = 1e07c79612b5525b76d4428401696566121d86cd
-SHA1 (patch-ab) = 2ea835a62f3ac8bebefef056f69c51b11ceb6099
-SHA1 (patch-ac) = a1bd65058559ec1704e2b64dade9f5a84066e67a
-SHA1 (patch-ak) = 3c8d6650147ad6a0043d705464267a5d947da488
-SHA1 (patch-ba) = 074eaf75ac7b3e8019950360283e1c65dc8a8109
+SHA1 (x264-snapshot-20121107-2245.tar.bz2) = 9b881d79f1dd8399451e17ac5e410280514ed1c4
+RMD160 (x264-snapshot-20121107-2245.tar.bz2) = 634a564002c84c6ab80ca1c419d0c1c503806e71
+Size (x264-snapshot-20121107-2245.tar.bz2) = 555368 bytes
+SHA1 (patch-aa) = f4505ef68e208d05d763e67625c172a85402db31
+SHA1 (patch-ab) = 548c8fcf4ec4397df69566da743ccc06b5800972
+SHA1 (patch-ac) = 8e39fe0d61f31bd4624e8b2f4cc6a795cbea4e77
+SHA1 (patch-ak) = bb73c847d6f7be5cee2eee1d77060b5633e5dfc2
+SHA1 (patch-ba) = a8f12131e23953704361fb499b568f8f233c6be6
diff -r 223217ee1f3a -r fc15a26bd992 multimedia/x264-devel/patches/patch-aa
--- a/multimedia/x264-devel/patches/patch-aa    Thu Nov 08 19:27:27 2012 +0000
+++ b/multimedia/x264-devel/patches/patch-aa    Thu Nov 08 19:55:56 2012 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.14 2012/01/16 11:06:06 drochner Exp $
+$NetBSD: patch-aa,v 1.15 2012/11/08 19:55:56 adam Exp $
 
---- configure.orig     2011-12-07 21:45:03.000000000 +0000
+--- configure.orig     2012-11-07 21:45:03.000000000 +0000
 +++ configure
-@@ -428,6 +428,10 @@ case $host_os in
+@@ -465,6 +465,10 @@ case $host_os in
          SYS="FREEBSD"
          LDFLAGS="$LDFLAGS -lm"
          ;;
@@ -13,7 +13,7 @@
      kfreebsd*-gnu)
          SYS="FREEBSD"
          define HAVE_MALLOC_H
-@@ -522,7 +526,7 @@ case $host_cpu in
+@@ -564,7 +568,7 @@ case $host_cpu in
              ASFLAGS="$ASFLAGS -f elf"
          fi
          ;;
@@ -21,8 +21,8 @@
 +    x86_64|amd64)
          ARCH="X86_64"
          AS="yasm"
-         if [ "$SYS" = MACOSX ]; then
-@@ -540,13 +544,14 @@ case $host_cpu in
+         [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
+@@ -584,13 +588,14 @@ case $host_cpu in
          fi
          ;;
      powerpc|powerpc64)
@@ -38,7 +38,7 @@
                  CFLAGS="$CFLAGS -maltivec -mabi=altivec"
                  define HAVE_ALTIVEC_H
              fi
-@@ -686,7 +691,7 @@ fi
+@@ -736,7 +741,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"
  
@@ -47,7 +47,7 @@
  if [ "$thread" = "auto" ]; then
      thread="no"
      case $SYS in
-@@ -872,10 +877,11 @@ fi
+@@ -919,10 +924,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 -r 223217ee1f3a -r fc15a26bd992 multimedia/x264-devel/patches/patch-ab
--- a/multimedia/x264-devel/patches/patch-ab    Thu Nov 08 19:27:27 2012 +0000
+++ b/multimedia/x264-devel/patches/patch-ab    Thu Nov 08 19:55:56 2012 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.15 2012/01/09 17:04:03 drochner Exp $
+$NetBSD: patch-ab,v 1.16 2012/11/08 19:55:56 adam Exp $
 
---- Makefile.orig      2011-12-07 21:45:03.000000000 +0000
+--- Makefile.orig      2012-11-07 21:45:03.000000000 +0000
 +++ Makefile
-@@ -88,9 +88,9 @@ endif
+@@ -99,9 +99,9 @@ endif
  ifdef ARCH_X86
- ASFLAGS += -Icommon/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 @@
  endif
  endif
  
-@@ -110,7 +110,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 @@
  endif
  endif
  
-@@ -118,7 +118,7 @@ endif
+@@ -129,7 +129,7 @@ endif
  ifeq ($(ARCH),UltraSPARC)
  ifeq ($(findstring HIGH_BIT_DEPTH, $(CONFIG)),)
  ASMSRC += common/sparc/pixel.asm
@@ -32,20 +32,17 @@
  endif
  endif
  
-@@ -132,8 +132,8 @@ SRCSO += x264dll.c
+@@ -145,20 +145,23 @@ OBJSO  += $(if $(RC), x264res.dll.o)
  endif
  endif
  
--OBJS = $(SRCS:%.c=%.o)
--OBJCLI = $(SRCCLI:%.c=%.o)
-+OBJS = $(SRCS:%.c=%.lo)
-+OBJCLI = $(SRCCLI:%.c=%.lo)
- OBJSO = $(SRCSO:%.c=%.o)
- DEP  = depend
+-OBJS   += $(SRCS:%.c=%.o)
+-OBJCLI += $(SRCCLI:%.c=%.o)
++OBJS   += $(SRCS:%.c=%.lo)
++OBJCLI += $(SRCCLI:%.c=%.lo)
+ OBJSO  += $(SRCSO:%.c=%.o)
  
-@@ -141,14 +141,17 @@ DEP  = depend
- 
- default: $(DEP)
+ .PHONY: all default fprofiled clean distclean install uninstall lib-static lib-shared cli install-lib-dev install-lib-static install-lib-shared install-cli
  
 +%.lo: %.c
 +      ${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} ${PICFLAGS} -o $@ $<
@@ -66,7 +63,7 @@
  
  $(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
        $(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
-@@ -159,17 +162,17 @@ x264: x264$(EXE)
+@@ -169,17 +172,17 @@ x264: x264$(EXE)
  checkasm: checkasm$(EXE)
  endif
  
@@ -91,7 +88,7 @@
  
  %.o: %.S
        $(AS) $(ASFLAGS) -o $@ $<
-@@ -234,8 +237,7 @@ install-lib-dev:
+@@ -250,8 +253,7 @@ install-lib-dev:
        install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
  
  install-lib-static: lib-static install-lib-dev
diff -r 223217ee1f3a -r fc15a26bd992 multimedia/x264-devel/patches/patch-ac
--- a/multimedia/x264-devel/patches/patch-ac    Thu Nov 08 19:27:27 2012 +0000
+++ b/multimedia/x264-devel/patches/patch-ac    Thu Nov 08 19:55:56 2012 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.7 2011/01/17 16:46:42 drochner Exp $
+$NetBSD: patch-ac,v 1.8 2012/11/08 19:55:56 adam Exp $
 
---- common/cpu.c.orig  2010-11-02 06:45:07.000000000 +0900
-+++ common/cpu.c       2011-01-09 21:05:03.000000000 +0900
+--- common/cpu.c.orig  2012-11-07 21:45:03.000000000 +0000
++++ common/cpu.c
 @@ -39,7 +39,7 @@
  #include <sys/types.h>
  #include <sys/sysctl.h>
@@ -11,7 +11,7 @@
  #include <sys/param.h>
  #include <sys/sysctl.h>
  #include <machine/cpu.h>
-@@ -237,13 +237,13 @@
+@@ -293,13 +293,13 @@ uint32_t x264_cpu_detect( void )
  
  #elif ARCH_PPC
  
@@ -27,7 +27,7 @@
      int      selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC };
  #else
      int      selectors[2] = { CTL_HW, HW_VECTORUNIT };
-@@ -361,7 +361,7 @@
+@@ -424,7 +424,7 @@ int x264_cpu_num_processors( void )
  #elif SYS_MACOSX || SYS_FREEBSD || SYS_OPENBSD
      int ncpu;
      size_t length = sizeof( ncpu );
diff -r 223217ee1f3a -r fc15a26bd992 multimedia/x264-devel/patches/patch-ak
--- a/multimedia/x264-devel/patches/patch-ak    Thu Nov 08 19:27:27 2012 +0000
+++ b/multimedia/x264-devel/patches/patch-ak    Thu Nov 08 19:55:56 2012 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.2 2011/01/17 16:46:42 drochner Exp $
+$NetBSD: patch-ak,v 1.3 2012/11/08 19:55:56 adam Exp $
 
---- common/display-x11.c~      2011-01-09 17:35:14.000000000 +0900
+--- common/display-x11.c.orig  2011-01-09 17:35:14.000000000 +0900
 +++ common/display-x11.c       2011-01-09 17:44:27.000000000 +0900
-@@ -21,7 +21,9 @@
+@@ -26,7 +26,9 @@
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
  #include <stdio.h>
diff -r 223217ee1f3a -r fc15a26bd992 multimedia/x264-devel/patches/patch-ba
--- a/multimedia/x264-devel/patches/patch-ba    Thu Nov 08 19:27:27 2012 +0000
+++ b/multimedia/x264-devel/patches/patch-ba    Thu Nov 08 19:55:56 2012 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.3 2011/07/18 21:00:12 drochner Exp $
+$NetBSD: patch-ba,v 1.4 2012/11/08 19:55:56 adam Exp $
 
 --- encoder/analyse.c.orig     2011-07-07 20:45:05.000000000 +0000
 +++ encoder/analyse.c
-@@ -283,7 +283,7 @@ float *x264_analyse_prepare_costs( x264_
+@@ -285,7 +285,7 @@ float *x264_analyse_prepare_costs( x264_
          return NULL;
      logs[0] = 0.718f;
      for( int i = 1; i <= 2*4*2048; i++ )