cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to x264-20140525.

Browse Source 
ok juan@
This commit is contained in:
brad 2014-06-02 22:01:02 +00:00
parent 52c24aaed1
commit 64e8373cad
5 changed files with 26 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
multimedia/x264/Makefile
View File

@ -1,16 +1,15 @@
# $OpenBSD: Makefile,v 1.28 2014/05/31 01:54:17 brad Exp $
# $OpenBSD: Makefile,v 1.29 2014/06/02 22:01:02 brad Exp $
COMMENT= free H.264/MPEG-4 AVC encoder
V= 20131002
V= 20140525
DISTNAME= x264-snapshot-${V}-2245
PKGNAME= x264-${V}
REVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/
EXTRACT_SUFX= .tar.bz2
SHARED_LIBS= x264 12.0
SHARED_LIBS= x264 13.0
HOMEPAGE= http://www.videolan.org/developers/x264.html

4
multimedia/x264/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (x264-snapshot-20131002-2245.tar.bz2) = /KmHJgk72lkY21NZ4tCVf/pEAl7yCPdKeodWYMNBmok=
SIZE (x264-snapshot-20131002-2245.tar.bz2) = 629291
SHA256 (x264-snapshot-20140525-2245.tar.bz2) = H+Fu1WzqUH4fOoQfft6HVE0nT0mmxlrovdd6ptVHp3M=
SIZE (x264-snapshot-20140525-2245.tar.bz2) = 628913

26
multimedia/x264/patches/patch-Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.11 2013/10/06 20:38:52 brad Exp $
--- Makefile.orig Wed Oct 2 16:45:04 2013
+++ Makefile Wed Oct 2 22:00:35 2013
@@ -102,7 +102,9 @@ ifdef ARCH_X86
$OpenBSD: patch-Makefile,v 1.12 2014/06/02 22:01:02 brad Exp $
--- Makefile.orig Sun May 25 16:45:05 2014
+++ Makefile Mon May 26 15:16:54 2014
@@ -101,7 +101,9 @@ ifdef ARCH_X86
ASFLAGS += -I$(SRCPATH)/common/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.11 2013/10/06 20:38:52 brad Exp $
OBJCHK += tools/checkasm-a.o
endif
endif
@@ -155,8 +157,10 @@ SRCS += common/opencl.c encoder/slicetype-cl.c
@@ -154,8 +156,10 @@ SRCS += common/opencl.c encoder/slicetype-cl.c
endif
OBJS += $(SRCS:%.c=%.o)
@ -22,7 +22,7 @@ $OpenBSD: patch-Makefile,v 1.11 2013/10/06 20:38:52 brad Exp $
.PHONY: all default fprofiled clean distclean install uninstall lib-static lib-shared cli install-lib-dev install-lib-static install-lib-shared install-cli
@@ -169,8 +173,8 @@ $(LIBX264): $(GENERATED) .depend $(OBJS) $(OBJASM)
@@ -168,8 +172,8 @@ $(LIBX264): $(GENERATED) .depend $(OBJS) $(OBJASM)
$(AR)$@ $(OBJS) $(OBJASM)
$(if $(RANLIB), $(RANLIB) $@)
@ -33,7 +33,7 @@ $OpenBSD: patch-Makefile,v 1.11 2013/10/06 20:38:52 brad Exp $
ifneq ($(EXE),)
.PHONY: x264 checkasm
@@ -179,7 +183,7 @@ checkasm: checkasm$(EXE)
@@ -178,7 +182,7 @@ checkasm: checkasm$(EXE)
endif
x264$(EXE): $(GENERATED) .depend $(OBJCLI) $(CLI_LIBX264)
@ -42,7 +42,7 @@ $OpenBSD: patch-Makefile,v 1.11 2013/10/06 20:38:52 brad Exp $
checkasm$(EXE): $(GENERATED) .depend $(OBJCHK) $(LIBX264)
$(LD)$@ $(OBJCHK) $(LIBX264) $(LDFLAGS)
@@ -190,10 +194,21 @@ $(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(OBJCHK): .depen
@@ -189,10 +193,21 @@ $(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(OBJCHK): .depen
$(AS) $(ASFLAGS) -o $@ $<
-@ $(if $(STRIP), $(STRIP) -x $@) # delete local/anonymous symbols, so they don't show up in oprofile
@ -64,7 +64,7 @@ $OpenBSD: patch-Makefile,v 1.11 2013/10/06 20:38:52 brad Exp $
%.dll.o: %.rc x264.h
$(RC) $(RCFLAGS)$@ -DDLL $<
@@ -239,7 +254,7 @@ fprofiled:
@@ -238,7 +253,7 @@ fprofiled:
endif
clean:
@ -73,11 +73,11 @@ $OpenBSD: patch-Makefile,v 1.11 2013/10/06 20:38:52 brad Exp $
rm -f checkasm checkasm.exe $(OBJCHK) $(GENERATED) x264_lookahead.clbin
rm -f $(SRC2:%.c=%.gcda) $(SRC2:%.c=%.gcno) *.dyn pgopti.dpi pgopti.dpi.lock
@@ -268,7 +283,6 @@ ifneq ($(IMPLIBNAME),)
install -m 755 $(SONAME) $(DESTDIR)$(bindir)
install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir)
@@ -267,7 +282,6 @@ ifneq ($(IMPLIBNAME),)
$(INSTALL) -m 755 $(SONAME) $(DESTDIR)$(bindir)
$(INSTALL) -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir)
else ifneq ($(SONAME),)
- ln -f -s $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX)
install -m 755 $(SONAME) $(DESTDIR)$(libdir)
$(INSTALL) -m 755 $(SONAME) $(DESTDIR)$(libdir)
endif

16
multimedia/x264/patches/patch-configure
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-configure,v 1.15 2013/10/06 20:38:52 brad Exp $
--- configure.orig Wed Oct 2 16:45:04 2013
+++ configure Wed Oct 2 21:54:21 2013
$OpenBSD: patch-configure,v 1.16 2014/06/02 22:01:02 brad Exp $
--- configure.orig Sun May 25 16:45:05 2014
+++ configure Mon May 26 15:16:07 2014
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
cat <<EOF
@@ -963,18 +963,6 @@ fi
@@ -991,18 +991,6 @@ fi
cc_check "stdint.h" "" "uint32_t test_vec __attribute__ ((vector_size (16))) = {0,1,2,3};" && define HAVE_VECTOREXT
@ -24,9 +24,9 @@ $OpenBSD: patch-configure,v 1.15 2013/10/06 20:38:52 brad Exp $
-fi
-
if [ "$strip" = "yes" ]; then
CFLAGS="$CFLAGS -s"
LDFLAGS="$LDFLAGS -s"
@@ -985,9 +973,9 @@ if [ "$debug" = "yes" ]; then
fi
@@ -1012,9 +1000,9 @@ if [ "$debug" = "yes" ]; then
elif [ $ARCH = ARM ]; then
# arm-gcc-4.2 produces incorrect output with -ffast-math
# and it doesn't save any speed anyway on 4.4, so disable it
@ -38,7 +38,7 @@ $OpenBSD: patch-configure,v 1.15 2013/10/06 20:38:52 brad Exp $
fi
if cc_check '' -fno-tree-vectorize ; then
@@ -1161,7 +1149,6 @@ if [ "$cli" = "yes" ]; then
@@ -1189,7 +1177,6 @@ if [ "$cli" = "yes" ]; then
fi
if [ "$shared" = "yes" ]; then
@ -46,7 +46,7 @@ $OpenBSD: patch-configure,v 1.15 2013/10/06 20:38:52 brad Exp $
if [ "$SYS" = "WINDOWS" -o "$SYS" = "CYGWIN" ]; then
echo "SONAME=libx264-$API.dll" >> config.mak
if [ $compiler = ICL ]; then
@@ -1189,7 +1176,7 @@ if [ "$shared" = "yes" ]; then
@@ -1217,7 +1204,7 @@ if [ "$shared" = "yes" ]; then
else
echo "SOSUFFIX=so" >> config.mak
echo "SONAME=libx264.so.$API" >> config.mak

31
multimedia/x264/patches/patch-version_sh
View File

@ -1,31 +0,0 @@
$OpenBSD: patch-version_sh,v 1.4 2012/05/25 07:45:33 ajacoutot Exp $
--- version.sh.orig Sun May 20 16:45:03 2012
+++ version.sh Sun May 20 20:08:39 2012
@@ -1,24 +1,6 @@
-#!/bin/bash
-[ -n "$1" ] && cd $1
-git rev-list HEAD | sort > config.git-hash
-LOCALVER=`wc -l config.git-hash | awk '{print $1}'`
-if [ $LOCALVER \> 1 ] ; then
- VER=`git rev-list origin/master | sort | join config.git-hash - | wc -l | awk '{print $1}'`
- VER_DIFF=$(($LOCALVER-$VER))
- echo "#define X264_REV $VER"
- echo "#define X264_REV_DIFF $VER_DIFF"
- if [ $VER_DIFF != 0 ] ; then
- VER="$VER+$VER_DIFF"
- fi
- if git status | grep -q "modified:" ; then
- VER="${VER}M"
- fi
- VER="$VER $(git rev-list HEAD -n 1 | cut -c 1-7)"
- echo "#define X264_VERSION \" r$VER\""
-else
- echo "#define X264_VERSION \"\""
- VER="x"
-fi
+#!/bin/sh
+echo "#define X264_VERSION \"\""
+VER="x"
rm -f config.git-hash
API=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* \([1-9][0-9]*\).*/\1/'`
echo "#define X264_POINTVER \"0.$API.$VER\""