Attachment 158238 Details for Bug 201260 – Patch for x264 port

[patch] Patch for x264 port

x264.patch (text/plain), 5.41 KB, created by Andrey Cherkashin on 2015-07-01 21:16:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrey Cherkashin

Created: 2015-07-01 21:16:16 UTC

Size: 5.41 KB

patch

obsolete

>diff -ruN x264.orig/Makefile x264/Makefile
>--- x264.orig/Makefile	2015-03-25 10:36:47.000000000 -0700
>+++ x264/Makefile	2015-07-01 00:00:45.857392288 -0700
>@@ -19,7 +19,7 @@
> 
> PORTNAME=	x264
> PORTVERSION=	0.${X264_BUILD}.${X264_REV}
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	multimedia
> MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
> 		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
>@@ -38,11 +38,11 @@
> 		bash:${PORTSDIR}/shells/bash
> LIB_DEPENDS=	libx264.so:${PORTSDIR}/multimedia/libx264
> 
>-X264_BUILD=	142
>-X264_REV=	2455
>-X264_COMMIT=	021c0dc6c95c1bc239c9db78a80dd85fc856a4dd
>+X264_BUILD=	144
>+X264_REV=	2533
>+X264_COMMIT= c8a773ebfca148ef04f5a60d42cbd7336af0baf6
> X264_GITVER=	${X264_COMMIT:C/^(.......).*$/\1/g}
>-X264_SNAPSHOT=	20140827
>+X264_SNAPSHOT=	20150629
> 
> USES=		gmake pkgconfig tar:bzip2
> USE_LDCONFIG=	yes
>diff -ruN x264.orig/distinfo x264/distinfo
>--- x264.orig/distinfo	2014-11-22 08:23:34.000000000 -0800
>+++ x264/distinfo	2015-07-01 00:00:45.857392288 -0700
>@@ -1,4 +1,2 @@
>-SHA256 (x264/x264-snapshot-20140827-2245-stable.tar.bz2) = fb1de3f802a83778527d45e69b552efa73b677ebb3ac633a8720923e71ffc5e3
>-SIZE (x264/x264-snapshot-20140827-2245-stable.tar.bz2) = 624939
>-SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
>-SIZE (x264/example.y4m.bz2) = 4910029
>+SHA256 (x264/x264-snapshot-20150629-2245-stable.tar.bz2) = 403a1e7178cf9d676d5ffd4641031ae568a501bb3c14fc8ca9bb7c8ac7465340
>+SIZE (x264/x264-snapshot-20150629-2245-stable.tar.bz2) = 672453
>diff -ruN x264.orig/files/patch-Makefile x264/files/patch-Makefile
>--- x264.orig/files/patch-Makefile	2014-12-30 22:20:13.000000000 -0800
>+++ x264/files/patch-Makefile	2015-07-01 00:00:45.858392046 -0700
>@@ -1,42 +1,44 @@
>---- Makefile.orig	2014-08-27 20:45:08 UTC
>+--- Makefile.orig	2015-06-30 00:19:51 UTC
> +++ Makefile
>-@@ -85,12 +85,12 @@ X86SRC0 += sad-a.asm
>+@@ -87,12 +87,12 @@ X86SRC0 += sad-a.asm
>  endif
>  X86SRC = $(X86SRC0:%=common/x86/%)
>  
>--ifeq ($(ARCH),X86)
>-+ifeq ($(ARCH),i386)
>+-ifeq ($(SYS_ARCH),X86)
>++ifeq ($(SYS_ARCH),i386)
>  ARCH_X86 = yes
>  ASMSRC   = $(X86SRC) common/x86/pixel-32.asm
>  endif
>  
>--ifeq ($(ARCH),X86_64)
>-+ifeq ($(ARCH),amd64)
>+-ifeq ($(SYS_ARCH),X86_64)
>++ifeq ($(SYS_ARCH),amd64)
>  ARCH_X86 = yes
>  ASMSRC   = $(X86SRC:-32.asm=-64.asm) common/x86/trellis-64.asm
>  endif
>-@@ -104,7 +104,14 @@ endif
>+@@ -106,7 +106,7 @@ endif
>  endif
>  
>  # AltiVec optims
>--ifeq ($(ARCH),PPC)
>-+ifeq ($(ARCH),powerpc)
>-+ARCH_PPC = yes
>-+endif
>-+ifeq ($(ARCH),powerpc64)
>-+ARCH_PPC = yes
>-+endif
>-+
>-+ifdef ARCH_PPC
>+-ifeq ($(SYS_ARCH),PPC)
>++ifeq ($(SYS_ARCH),powerpc)
>  ifneq ($(AS),)
>  SRCS += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \
>          common/ppc/quant.c common/ppc/deblock.c \
>-@@ -113,7 +120,7 @@ endif
>+@@ -115,7 +115,7 @@ endif
>  endif
>  
>  # NEON optims
>--ifeq ($(ARCH),ARM)
>-+ifeq ($(ARCH),armv6)
>+-ifeq ($(SYS_ARCH),ARM)
>++ifeq ($(SYS_ARCH),armv6)
>  ifneq ($(AS),)
>  ASMSRC += common/arm/cpu-a.S common/arm/pixel-a.S common/arm/mc-a.S \
>            common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \
>+@@ -126,7 +126,7 @@ endif
>+ endif
>+ 
>+ # AArch64 NEON optims
>+-ifeq ($(SYS_ARCH),AARCH64)
>++ifeq ($(SYS_ARCH),armv7)
>+ ifneq ($(AS),)
>+ ASMSRC += common/aarch64/bitstream-a.S \
>+           common/aarch64/cabac-a.S     \
>diff -ruN x264.orig/files/patch-common_cpu.c x264/files/patch-common_cpu.c
>--- x264.orig/files/patch-common_cpu.c	2014-12-30 22:20:13.000000000 -0800
>+++ x264/files/patch-common_cpu.c	1969-12-31 16:00:00.000000000 -0800
>@@ -1,29 +0,0 @@
>---- common/cpu.c.orig	2014-08-27 20:45:08 UTC
>-+++ common/cpu.c
>-@@ -313,7 +313,7 @@ uint32_t x264_cpu_detect( void )
>- 
>- #elif ARCH_PPC
>- 
>--#if SYS_MACOSX || SYS_OPENBSD
>-+#if SYS_MACOSX || SYS_OPENBSD || SYS_FREEBSD
>- #include <sys/sysctl.h>
>- uint32_t x264_cpu_detect( void )
>- {
>-@@ -321,12 +321,16 @@ uint32_t x264_cpu_detect( void )
>-     uint32_t cpu = 0;
>- #if SYS_OPENBSD
>-     int      selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC };
>--#else
>-+#elif SYS_MACOSX
>-     int      selectors[2] = { CTL_HW, HW_VECTORUNIT };
>- #endif
>-     int      has_altivec = 0;
>-     size_t   length = sizeof( has_altivec );
>-+#if SYS_MACOSX || SYS_OPENBSD
>-     int      error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 );
>-+#else
>-+    int      error = sysctlbyname("hw.altivec", &has_altivec, &length, NULL, 0 );
>-+#endif
>- 
>-     if( error == 0 && has_altivec != 0 )
>-         cpu |= X264_CPU_ALTIVEC;
>diff -ruN x264.orig/files/patch-configure x264/files/patch-configure
>--- x264.orig/files/patch-configure	2014-12-30 22:20:13.000000000 -0800
>+++ x264/files/patch-configure	1969-12-31 16:00:00.000000000 -0800
>@@ -1,25 +0,0 @@
>-From 9463ec0004f1bddc49c05ed8e38430a4ce1738fb Mon Sep 17 00:00:00 2001
>-From: Janne Grunau <janne-x264@jannau.net>
>-Date: Sun, 20 Jul 2014 13:40:28 +0200
>-Subject: [PATCH] arm/ppc: use $CC as default assembler
>-
>---- configure.orig	2014-08-27 20:45:08 UTC
>-+++ configure
>-@@ -648,7 +648,7 @@ case $host_cpu in
>-         ARCH="PPC"
>-         if [ $asm = auto ] ; then
>-             define HAVE_ALTIVEC
>--            AS="${AS-${cross_prefix}gcc}"
>-+            AS="${AS-${CC}}"
>-             if [ $SYS = MACOSX ] ; then
>-                 CFLAGS="$CFLAGS -faltivec -fastf -mcpu=G4"
>-             else
>-@@ -674,7 +674,7 @@ case $host_cpu in
>-                 LDFLAGS="$LDFLAGS -arch armv7"
>-             fi
>-         else
>--            AS="${AS-${cross_prefix}gcc}"
>-+            AS="${AS-${CC}}"
>-         fi
>-         ;;
>-     s390|s390x)

Actions: View | Diff

Attachments on bug 201260: 158238 | 158240 | 158241 | 158245 | 158246