From c24c1fd9fa46a397afef840727eb1efda6b6d717 Mon Sep 17 00:00:00 2001 From: jakemsr Date: Sat, 12 Mar 2011 21:07:09 +0000 Subject: [PATCH] update to x264-20110225 from Brad (MAINTAINER) --- multimedia/x264/Makefile | 6 +++--- multimedia/x264/distinfo | 10 +++++----- multimedia/x264/patches/patch-Makefile | 18 +++++++++--------- multimedia/x264/patches/patch-configure | 14 +++++++------- multimedia/x264/pkg/PLIST | 3 ++- 5 files changed, 26 insertions(+), 25 deletions(-) diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile index f304d999fab..5a6a7992fb7 100644 --- a/multimedia/x264/Makefile +++ b/multimedia/x264/Makefile @@ -1,15 +1,15 @@ -# $OpenBSD: Makefile,v 1.12 2010/11/06 23:05:48 jakemsr Exp $ +# $OpenBSD: Makefile,v 1.13 2011/03/12 21:07:09 jakemsr Exp $ COMMENT= free H264/AVC encoder -V= 20101023 +V= 20110225 DISTNAME= x264-snapshot-${V}-2245 PKGNAME= x264-${V} CATEGORIES= multimedia MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ EXTRACT_SUFX= .tar.bz2 -SHARED_LIBS= x264 5.0 +SHARED_LIBS= x264 6.0 HOMEPAGE= http://www.videolan.org/developers/x264.html diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo index 55d1511ee07..f87fc19a755 100644 --- a/multimedia/x264/distinfo +++ b/multimedia/x264/distinfo @@ -1,5 +1,5 @@ -MD5 (x264-snapshot-20101023-2245.tar.bz2) = sY0Hf/G5TuU4YGSUVaDoZg== -RMD160 (x264-snapshot-20101023-2245.tar.bz2) = IsivhEaIsAmoKqF418tCDhNZvO8= -SHA1 (x264-snapshot-20101023-2245.tar.bz2) = atJD3BK9gzi+0K9Pw+vcibdkG2A= -SHA256 (x264-snapshot-20101023-2245.tar.bz2) = tTjNnTmyJHqRBd3e6Pb3aTetPYU/P8gPiUkx3WndDmk= -SIZE (x264-snapshot-20101023-2245.tar.bz2) = 449079 +MD5 (x264-snapshot-20110225-2245.tar.bz2) = lvwVOfSI4vHWtCfV6lwu2Q== +RMD160 (x264-snapshot-20110225-2245.tar.bz2) = oCAuNJ29IHz198jOeAt58hHhsb4= +SHA1 (x264-snapshot-20110225-2245.tar.bz2) = B2AhOk7zK7EMjzEXOy2qlLZcZBE= +SHA256 (x264-snapshot-20110225-2245.tar.bz2) = mjVWqo9wkdUYR+aebds/p6zUEc0y00a5cdQGm1zN2x8= +SIZE (x264-snapshot-20110225-2245.tar.bz2) = 485965 diff --git a/multimedia/x264/patches/patch-Makefile b/multimedia/x264/patches/patch-Makefile index f98dd0a095b..02aa68644ef 100644 --- a/multimedia/x264/patches/patch-Makefile +++ b/multimedia/x264/patches/patch-Makefile @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile,v 1.6 2010/11/06 23:05:48 jakemsr Exp $ ---- Makefile.orig Sun Oct 31 17:45:08 2010 -+++ Makefile Sun Oct 31 18:53:02 2010 -@@ -78,7 +78,9 @@ ifdef ARCH_X86 +$OpenBSD: patch-Makefile,v 1.7 2011/03/12 21:07:09 jakemsr Exp $ +--- Makefile.orig Fri Feb 25 16:45:04 2011 ++++ Makefile Fri Feb 25 22:17:05 2011 +@@ -87,7 +87,9 @@ ifdef ARCH_X86 ASFLAGS += -Icommon/x86/ SRCS += common/x86/mc-c.c common/x86/predict-c.c OBJASM = $(ASMSRC:%.asm=%.o) @@ -11,7 +11,7 @@ $OpenBSD: patch-Makefile,v 1.6 2010/11/06 23:05:48 jakemsr Exp $ checkasm: tools/checkasm-a.o endif endif -@@ -120,8 +122,10 @@ endif +@@ -131,8 +133,10 @@ endif endif OBJS = $(SRCS:%.c=%.o) @@ -22,7 +22,7 @@ $OpenBSD: patch-Makefile,v 1.6 2010/11/06 23:05:48 jakemsr Exp $ DEP = depend .PHONY: all default fprofiled clean distclean install uninstall dox test testclean -@@ -132,8 +136,8 @@ libx264.a: .depend $(OBJS) $(OBJASM) +@@ -143,8 +147,8 @@ libx264.a: .depend $(OBJS) $(OBJASM) $(AR) rc libx264.a $(OBJS) $(OBJASM) $(RANLIB) libx264.a @@ -33,7 +33,7 @@ $OpenBSD: patch-Makefile,v 1.6 2010/11/06 23:05:48 jakemsr Exp $ x264$(EXE): $(OBJCLI) libx264.a $(CC) -o $@ $+ $(LDFLAGSCLI) $(LDFLAGS) -@@ -145,10 +149,21 @@ checkasm: tools/checkasm.o libx264.a +@@ -156,10 +160,21 @@ checkasm: tools/checkasm.o libx264.a $(AS) $(ASFLAGS) -o $@ $< -@ $(STRIP) -x $@ # delete local/anonymous symbols, so they don't show up in oprofile @@ -55,7 +55,7 @@ $OpenBSD: patch-Makefile,v 1.6 2010/11/06 23:05:48 jakemsr Exp $ .depend: config.mak @rm -f .depend @$(foreach SRC, $(SRCS) $(SRCCLI) $(SRCSO), $(CC) $(CFLAGS) $(SRC) -MT $(SRC:%.c=%.o) -MM -g0 1>> .depend;) -@@ -192,7 +207,7 @@ fprofiled: +@@ -203,7 +218,7 @@ fprofiled: endif clean: @@ -64,7 +64,7 @@ $OpenBSD: patch-Makefile,v 1.6 2010/11/06 23:05:48 jakemsr Exp $ rm -f checkasm checkasm.exe tools/checkasm.o tools/checkasm-a.o rm -f $(SRC2:%.c=%.gcda) $(SRC2:%.c=%.gcno) - sed -e 's/ *-fprofile-\(generate\|use\)//g' config.mak > config.mak2 && mv config.mak2 config.mak -@@ -214,7 +229,6 @@ install: x264$(EXE) $(SONAME) +@@ -226,7 +241,6 @@ install: x264$(EXE) $(SONAME) ifeq ($(SYS),MINGW) $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir)) else diff --git a/multimedia/x264/patches/patch-configure b/multimedia/x264/patches/patch-configure index 883d70c6ac9..dca4e78f9e4 100644 --- a/multimedia/x264/patches/patch-configure +++ b/multimedia/x264/patches/patch-configure @@ -1,13 +1,13 @@ -$OpenBSD: patch-configure,v 1.7 2010/11/06 23:05:48 jakemsr Exp $ ---- configure.orig Sun Oct 31 17:45:08 2010 -+++ configure Sun Oct 31 17:51:47 2010 +$OpenBSD: patch-configure,v 1.8 2011/03/12 21:07:09 jakemsr Exp $ +--- configure.orig Fri Feb 25 16:45:04 2011 ++++ configure Fri Feb 25 22:17:05 2011 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh if test x"$1" = x"-h" -o x"$1" = x"--help" ; then - -@@ -670,26 +670,14 @@ if [ "$avs" = "auto" ] ; then + cat <> config.mak echo 'IMPLIBNAME=libx264.dll.a' >> config.mak -@@ -765,14 +752,13 @@ if [ "$shared" = "yes" ]; then +@@ -819,14 +806,13 @@ if [ "$shared" = "yes" ]; then else echo "SOSUFFIX=so" >> config.mak echo "SONAME=libx264.so.$API" >> config.mak diff --git a/multimedia/x264/pkg/PLIST b/multimedia/x264/pkg/PLIST index ff24fe9406c..185880ed330 100644 --- a/multimedia/x264/pkg/PLIST +++ b/multimedia/x264/pkg/PLIST @@ -1,7 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.2 2008/07/22 20:24:05 brad Exp $ +@comment $OpenBSD: PLIST,v 1.3 2011/03/12 21:07:09 jakemsr Exp $ %%SHARED%% @bin bin/x264 include/x264.h +include/x264_config.h lib/libx264.a lib/pkgconfig/ lib/pkgconfig/x264.pc