Update to 20191220 snapshot.
from Brad (maintainer)
This commit is contained in:
parent
523fd4684d
commit
8f5e792c9a
@ -1,16 +1,15 @@
|
||||
# $OpenBSD: Makefile,v 1.53 2019/10/19 16:59:33 visa Exp $
|
||||
# $OpenBSD: Makefile,v 1.54 2019/12/24 15:03:18 ajacoutot Exp $
|
||||
|
||||
COMMENT= free H.264/MPEG-4 AVC encoder
|
||||
|
||||
V= 20190720
|
||||
V= 20191220
|
||||
DISTNAME= x264-snapshot-${V}-2245
|
||||
PKGNAME= x264-${V}
|
||||
REVISION= 0
|
||||
CATEGORIES= multimedia
|
||||
MASTER_SITES= https://downloads.videolan.org/pub/videolan/x264/snapshots/
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
MASTER_SITES= https://comstyle.com/source/
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
|
||||
SHARED_LIBS= x264 20.0
|
||||
SHARED_LIBS= x264 21.0
|
||||
|
||||
HOMEPAGE= https://www.videolan.org/developers/x264.html
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (x264-snapshot-20190720-2245.tar.bz2) = TUjhWrMoauj16Toq6RUL9xjFl73BJSe+MrJ32NkjPkk=
|
||||
SIZE (x264-snapshot-20190720-2245.tar.bz2) = 774812
|
||||
SHA256 (x264-snapshot-20191220-2245.tar.xz) = G2tMq8hlIwbeJQ/WhpTgLqHWbOqoRFsyGkyfBw5MLAg=
|
||||
SIZE (x264-snapshot-20191220-2245.tar.xz) = 672876
|
||||
|
@ -1,8 +1,9 @@
|
||||
$OpenBSD: patch-Makefile,v 1.18 2018/09/16 06:37:15 ajacoutot Exp $
|
||||
$OpenBSD: patch-Makefile,v 1.19 2019/12/24 15:03:18 ajacoutot Exp $
|
||||
|
||||
Index: Makefile
|
||||
--- Makefile.orig
|
||||
+++ Makefile
|
||||
@@ -255,7 +255,7 @@ example: example$(EXE)
|
||||
@@ -260,7 +260,7 @@ example: example$(EXE)
|
||||
endif
|
||||
|
||||
x264$(EXE): $(GENERATED) .depend $(OBJCLI) $(CLI_LIBX264)
|
||||
@ -11,7 +12,7 @@ Index: Makefile
|
||||
|
||||
checkasm8$(EXE): $(GENERATED) .depend $(OBJCHK) $(OBJCHK_8) $(LIBX264)
|
||||
$(LD)$@ $(OBJCHK) $(OBJCHK_8) $(LIBX264) $(LDFLAGS)
|
||||
@@ -398,7 +398,6 @@ ifneq ($(IMPLIBNAME),)
|
||||
@@ -406,7 +406,6 @@ ifneq ($(IMPLIBNAME),)
|
||||
$(INSTALL) -m 755 $(SONAME) $(DESTDIR)$(bindir)
|
||||
$(INSTALL) -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir)
|
||||
else ifneq ($(SONAME),)
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-common_osdep_h,v 1.11 2018/09/16 06:37:15 ajacoutot Exp $
|
||||
$OpenBSD: patch-common_osdep_h,v 1.12 2019/12/24 15:03:18 ajacoutot Exp $
|
||||
|
||||
Enable the use of __sync_fetch_and_add() on aarch64, alpha, arm, mips64,
|
||||
powerpc and sparc64.
|
||||
@ -6,7 +6,7 @@ powerpc and sparc64.
|
||||
Index: common/osdep.h
|
||||
--- common/osdep.h.orig
|
||||
+++ common/osdep.h
|
||||
@@ -255,7 +255,8 @@ int x264_threading_init( void );
|
||||
@@ -367,7 +367,8 @@ X264_API int x264_threading_init( void );
|
||||
static ALWAYS_INLINE int x264_pthread_fetch_and_add( int *val, int add, x264_pthread_mutex_t *mutex )
|
||||
{
|
||||
#if HAVE_THREAD
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-configure,v 1.26 2019/07/22 06:56:33 ajacoutot Exp $
|
||||
$OpenBSD: patch-configure,v 1.27 2019/12/24 15:03:18 ajacoutot Exp $
|
||||
|
||||
Index: configure
|
||||
--- configure.orig
|
||||
@ -9,7 +9,7 @@ Index: configure
|
||||
|
||||
if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
|
||||
cat <<EOF
|
||||
@@ -1259,10 +1259,6 @@ if [ "$pic" = "yes" ] ; then
|
||||
@@ -1282,10 +1282,6 @@ if [ "$pic" = "yes" ] ; then
|
||||
[ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
|
||||
fi
|
||||
|
||||
@ -20,7 +20,7 @@ Index: configure
|
||||
if [ "$strip" = "yes" ]; then
|
||||
LDFLAGS="$LDFLAGS -s"
|
||||
fi
|
||||
@@ -1271,11 +1267,11 @@ if [ "$debug" = "yes" ]; then
|
||||
@@ -1294,11 +1290,11 @@ if [ "$debug" = "yes" ]; then
|
||||
CFLAGS="-O1 -g $CFLAGS"
|
||||
RCFLAGS="$RCFLAGS -DDEBUG"
|
||||
else
|
||||
@ -34,7 +34,7 @@ Index: configure
|
||||
fi
|
||||
fi
|
||||
[ "$lto" = "auto" ] && lto="no"
|
||||
@@ -1304,10 +1300,6 @@ if cc_check '' -Wshadow ; then
|
||||
@@ -1327,10 +1323,6 @@ if cc_check '' -Wshadow ; then
|
||||
CFLAGS="-Wshadow $CFLAGS"
|
||||
fi
|
||||
|
||||
@ -42,10 +42,10 @@ Index: configure
|
||||
- CFLAGS="-Wno-maybe-uninitialized $CFLAGS"
|
||||
-fi
|
||||
-
|
||||
if [ $compiler = ICC -o $compiler = ICL ] ; then
|
||||
if cc_check 'extras/intel_dispatcher.h' '' 'x264_intel_dispatcher_override();' ; then
|
||||
define HAVE_INTEL_DISPATCHER
|
||||
@@ -1485,7 +1477,6 @@ if [ "$cli" = "yes" ]; then
|
||||
if [ $compiler = GNU ] && cc_check '' -fvisibility=hidden ; then
|
||||
CFLAGS="$CFLAGS -fvisibility=hidden"
|
||||
fi
|
||||
@@ -1530,7 +1522,6 @@ if [ "$cli" = "yes" ]; then
|
||||
fi
|
||||
|
||||
if [ "$shared" = "yes" ]; then
|
||||
@ -53,7 +53,7 @@ Index: configure
|
||||
if [ "$SYS" = "WINDOWS" -o "$SYS" = "CYGWIN" ]; then
|
||||
echo "SONAME=libx264-$API.dll" >> config.mak
|
||||
if [ $compiler_style = MS ]; then
|
||||
@@ -1513,7 +1504,7 @@ if [ "$shared" = "yes" ]; then
|
||||
@@ -1551,7 +1542,7 @@ if [ "$shared" = "yes" ]; then
|
||||
else
|
||||
echo "SOSUFFIX=so" >> config.mak
|
||||
echo "SONAME=libx264.so.$API" >> config.mak
|
||||
|
Loading…
x
Reference in New Issue
Block a user