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

Update x264 to 20210415

Browse Source 
Update diff from Brad
This commit is contained in:
rsadowski 2021-04-28 04:03:24 +00:00
parent 15676ae6ec
commit 69d4c7a6e7
8 changed files with 23 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
multimedia/x264/Makefile
View File

@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.59 2021/04/03 11:15:46 sthen Exp $
# $OpenBSD: Makefile,v 1.60 2021/04/28 04:03:24 rsadowski Exp $
COMMENT= free H.264/MPEG-4 AVC encoder
DISTNAME= x264-20200705
DISTNAME= x264-20210415
GH_ACCOUNT= mirror
GH_PROJECT= x264
GH_COMMIT= cde9a93319bea766a92e306d69059c76de970190
REVISION= 1
GH_COMMIT= c347e7a0b476d77674e2c9a6f137f57da026e8fc
CATEGORIES= multimedia
SHARED_LIBS= x264 22.0
SHARED_LIBS= x264 23.0
HOMEPAGE= https://www.videolan.org/developers/x264.html
@ -33,6 +32,8 @@ USE_GMAKE= Yes
CONFIGURE_STYLE= simple
CONFIGURE_ENV= API=${LIBx264_VERSION}
CONFIGURE_ARGS+=--prefix=${PREFIX} \
--bashcompletionsdir=${LOCALBASE}/share/bash-completion/completions \
--enable-bashcompletion \
--enable-pic \
--enable-shared \
--enable-static \

5
multimedia/x264/distinfo
View File

@ -1,3 +1,2 @@
SHA256 (-33f9e147.tar.gz) = VFZFDuGuAs0jKL4xVzZ6IyoKtzMV6Mj4DauARpUk9SU=
SHA256 (x264-20200705-cde9a933.tar.gz) = hRW6up+CxyPgclJ0fpsOFmoWCRunLyAXOHZBckuuwC0=
SIZE (x264-20200705-cde9a933.tar.gz) = 933373
SHA256 (x264-20210415-c347e7a0.tar.gz) = /suw9UF7/cQN7gRcfllTeXeFr2jVhlkqP0uIcG9uXps=
SIZE (x264-20210415-c347e7a0.tar.gz) = 937339

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

@ -1,9 +1,9 @@
$OpenBSD: patch-Makefile,v 1.19 2019/12/24 15:03:18 ajacoutot Exp $
$OpenBSD: patch-Makefile,v 1.20 2021/04/28 04:03:24 rsadowski Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -260,7 +260,7 @@ example: example$(EXE)
@@ -261,7 +261,7 @@ example: example$(EXE)
endif
x264$(EXE): $(GENERATED) .depend $(OBJCLI) $(CLI_LIBX264)
@ -12,7 +12,7 @@ Index: Makefile
checkasm8$(EXE): $(GENERATED) .depend $(OBJCHK) $(OBJCHK_8) $(LIBX264)
$(LD)$@ $(OBJCHK) $(OBJCHK_8) $(LIBX264) $(LDFLAGS)
@@ -406,7 +406,6 @@ ifneq ($(IMPLIBNAME),)
@@ -407,7 +407,6 @@ ifneq ($(IMPLIBNAME),)
$(INSTALL) -m 755 $(SONAME) $(DESTDIR)$(bindir)
$(INSTALL) -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir)
else ifneq ($(SONAME),)

14
multimedia/x264/patches/patch-common_arm_asm_S
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-common_arm_asm_S,v 1.1 2018/09/16 06:37:15 ajacoutot Exp $
Index: common/arm/asm.S
--- common/arm/asm.S.orig
+++ common/arm/asm.S
@@ -74,7 +74,7 @@
# define FUNC @
#endif
-#if SYS_LINUX
+#if SYS_LINUX || SYS_OPENBSD
#define HAVE_SECTION_DATA_REL_RO 1
#else
#define HAVE_SECTION_DATA_REL_RO 0

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

@ -1,31 +0,0 @@
$OpenBSD: patch-common_cpu_c,v 1.6 2021/04/03 11:15:46 sthen Exp $
Index: common/cpu.c
--- common/cpu.c.orig
+++ common/cpu.c
@@ -433,7 +433,7 @@ int x264_cpu_num_processors( void )
#elif SYS_WINDOWS
return x264_pthread_num_processors_np();
-#elif SYS_CYGWIN || SYS_SunOS
+#elif SYS_CYGWIN || SYS_SunOS || SYS_OPENBSD
return sysconf( _SC_NPROCESSORS_ONLN );
#elif SYS_LINUX
@@ -460,15 +460,10 @@ int x264_cpu_num_processors( void )
get_system_info( &info );
return info.cpu_count;
-#elif SYS_MACOSX || SYS_FREEBSD || SYS_OPENBSD
+#elif SYS_MACOSX || SYS_FREEBSD
int ncpu;
size_t length = sizeof( ncpu );
-#if SYS_OPENBSD
- int mib[2] = { CTL_HW, HW_NCPU };
- if( sysctl(mib, 2, &ncpu, &length, NULL, 0) )
-#else
if( sysctlbyname("hw.ncpu", &ncpu, &length, NULL, 0) )
-#endif
{
ncpu = 1;
}

4
multimedia/x264/patches/patch-common_osdep_h
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-common_osdep_h,v 1.13 2020/03/01 10:02:12 ajacoutot Exp $
$OpenBSD: patch-common_osdep_h,v 1.14 2021/04/28 04:03:24 rsadowski Exp $
Enable the use of __sync_fetch_and_add().
Index: common/osdep.h
--- common/osdep.h.orig
+++ common/osdep.h
@@ -367,7 +367,7 @@ X264_API int x264_threading_init( void );
@@ -434,7 +434,7 @@ 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

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

@ -1,4 +1,4 @@
$OpenBSD: patch-configure,v 1.28 2020/07/05 07:42:11 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.29 2021/04/28 04:03:24 rsadowski 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
@@ -1283,10 +1283,6 @@ if [ "$pic" = "yes" ] ; then
@@ -1322,10 +1322,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
@@ -1295,11 +1291,11 @@ if [ "$debug" = "yes" ]; then
@@ -1334,11 +1330,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"
@@ -1328,10 +1324,6 @@ if cc_check '' -Wshadow ; then
@@ -1367,10 +1363,6 @@ if cc_check '' -Wshadow ; then
CFLAGS="-Wshadow $CFLAGS"
fi
@ -45,7 +45,7 @@ Index: configure
if [ $compiler = GNU ] && cc_check '' -fvisibility=hidden ; then
CFLAGS="$CFLAGS -fvisibility=hidden"
fi
@@ -1531,7 +1523,6 @@ if [ "$cli" = "yes" ]; then
@@ -1570,7 +1562,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
@@ -1552,7 +1543,7 @@ if [ "$shared" = "yes" ]; then
@@ -1591,7 +1582,7 @@ if [ "$shared" = "yes" ]; then
else
echo "SOSUFFIX=so" >> config.mak
echo "SONAME=libx264.so.$API" >> config.mak

5
multimedia/x264/pkg/PLIST
View File

@ -1,7 +1,10 @@
@comment $OpenBSD: PLIST,v 1.6 2020/07/05 07:42:11 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.7 2021/04/28 04:03:24 rsadowski Exp $
@bin bin/x264
include/x264.h
include/x264_config.h
@static-lib lib/libx264.a
@lib lib/libx264.so.${LIBx264_VERSION}
lib/pkgconfig/x264.pc
share/bash-completion/
share/bash-completion/completions/
share/bash-completion/completions/x264