Attachment #158245 for bug #201260





PORTNAME=	x264
PORTVERSION=	0.${X264_BUILD}.${X264_REV}
PORTREVISION=	2
CATEGORIES=	multimedia
MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo

		bash:${PORTSDIR}/shells/bash
LIB_DEPENDS=	libx264.so:${PORTSDIR}/multimedia/libx264

X264_BUILD=	144
X264_REV=	2533
X264_COMMIT= c8a773ebfca148ef04f5a60d42cbd7336af0baf6
X264_GITVER=	${X264_COMMIT:C/^(.......).*$/\1/g}
X264_SNAPSHOT=	20150629

USES=		gmake pkgconfig tar:bzip2
USE_LDCONFIG=	yes

Lines 1-4 Link Here

(-)x264/distinfo (-4 / +2 lines)
1	SHA256 (x264/x264-snapshot-20140827-2245-stable.tar.bz2) = fb1de3f802a83778527d45e69b552efa73b677ebb3ac633a8720923e71ffc5e3	1	SHA256 (x264/x264-snapshot-20150629-2245-stable.tar.bz2) = 403a1e7178cf9d676d5ffd4641031ae568a501bb3c14fc8ca9bb7c8ac7465340
2	SIZE (x264/x264-snapshot-20140827-2245-stable.tar.bz2) = 624939	2	SIZE (x264/x264-snapshot-20150629-2245-stable.tar.bz2) = 672453
3	SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
4	SIZE (x264/example.y4m.bz2) = 4910029




--- Makefile.orig	2015-06-30 00:19:51 UTC
+++ Makefile
@@ -87,12 +87,12 @@ X86SRC0 += sad-a.asm
 endif
 X86SRC = $(X86SRC0:%=common/x86/%)
 
-ifeq ($(SYS_ARCH),X86)
+ifeq ($(SYS_ARCH),i386)
 ARCH_X86 = yes
 ASMSRC   = $(X86SRC) common/x86/pixel-32.asm
 endif
 
-ifeq ($(SYS_ARCH),X86_64)
+ifeq ($(SYS_ARCH),amd64)
 ARCH_X86 = yes
 ASMSRC   = $(X86SRC:-32.asm=-64.asm) common/x86/trellis-64.asm
 endif
@@ -106,7 +106,7 @@ endif
 endif
 
 # AltiVec optims
-ifeq ($(SYS_ARCH),PPC)
+ifeq ($(SYS_ARCH),powerpc)
+ARCH_PPC = yes
+endif
+ifeq ($(ARCH),powerpc64)
+ARCH_PPC = yes
+endif
+
+ifdef ARCH_PPC
 ifneq ($(AS),)
 SRCS += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \
         common/ppc/quant.c common/ppc/deblock.c \
@@ -115,7 +115,7 @@ endif
 endif
 
 # NEON optims
-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),arm64)
 ifneq ($(AS),)
 ASMSRC += common/aarch64/bitstream-a.S \
           common/aarch64/cabac-a.S     \




--- 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;




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)

Return to bug 201260

Lines 19-25 Link Here

(-)x264/Makefile (-5 / +5 lines)
19		19
20	PORTNAME= x264	20	PORTNAME= x264
21	PORTVERSION= 0.${X264_BUILD}.${X264_REV}	21	PORTVERSION= 0.${X264_BUILD}.${X264_REV}
22	PORTREVISION= 1	22	PORTREVISION= 2
23	CATEGORIES= multimedia	23	CATEGORIES= multimedia
24	MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \	24	MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
25	http://samples.mplayerhq.hu/yuv4mpeg2/:pgo	25	http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
Lines 38-48 Link Here
38	bash:${PORTSDIR}/shells/bash	38	bash:${PORTSDIR}/shells/bash
39	LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264	39	LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264
40		40
41	X264_BUILD= 142	41	X264_BUILD= 144
42	X264_REV= 2455	42	X264_REV= 2533
43	X264_COMMIT= 021c0dc6c95c1bc239c9db78a80dd85fc856a4dd	43	X264_COMMIT= c8a773ebfca148ef04f5a60d42cbd7336af0baf6
44	X264_GITVER= ${X264_COMMIT:C/^(.......).*$/\1/g}	44	X264_GITVER= ${X264_COMMIT:C/^(.......).*$/\1/g}
45	X264_SNAPSHOT= 20140827	45	X264_SNAPSHOT= 20150629
46		46
47	USES= gmake pkgconfig tar:bzip2	47	USES= gmake pkgconfig tar:bzip2
48	USE_LDCONFIG= yes	48	USE_LDCONFIG= yes

Lines 1-42 Link Here

(-)x264/files/patch-Makefile (-19 / +21 lines)
1	--- Makefile.orig 2014-08-27 20:45:08 UTC	1	--- Makefile.orig 2015-06-30 00:19:51 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -85,12 +85,12 @@ X86SRC0 += sad-a.asm	3	@@ -87,12 +87,12 @@ X86SRC0 += sad-a.asm
4	endif	4	endif
5	X86SRC = $(X86SRC0:%=common/x86/%)	5	X86SRC = $(X86SRC0:%=common/x86/%)
6		6
7	-ifeq ($(ARCH),X86)	7	-ifeq ($(SYS_ARCH),X86)
8	+ifeq ($(ARCH),i386)	8	+ifeq ($(SYS_ARCH),i386)
9	ARCH_X86 = yes	9	ARCH_X86 = yes
10	ASMSRC = $(X86SRC) common/x86/pixel-32.asm	10	ASMSRC = $(X86SRC) common/x86/pixel-32.asm
11	endif	11	endif
12		12
13	-ifeq ($(ARCH),X86_64)	13	-ifeq ($(SYS_ARCH),X86_64)
14	+ifeq ($(ARCH),amd64)	14	+ifeq ($(SYS_ARCH),amd64)
15	ARCH_X86 = yes	15	ARCH_X86 = yes
16	ASMSRC = $(X86SRC:-32.asm=-64.asm) common/x86/trellis-64.asm	16	ASMSRC = $(X86SRC:-32.asm=-64.asm) common/x86/trellis-64.asm
17	endif	17	endif
18	@@ -104,7 +104,14 @@ endif	18	@@ -106,7 +106,7 @@ endif
19	endif	19	endif
20		20
21	# AltiVec optims	21	# AltiVec optims
22	-ifeq ($(ARCH),PPC)	22	-ifeq ($(SYS_ARCH),PPC)
23	+ifeq ($(ARCH),powerpc)	23	+ifeq ($(SYS_ARCH),powerpc)
24	+ARCH_PPC = yes
25	+endif
26	+ifeq ($(ARCH),powerpc64)
27	+ARCH_PPC = yes
28	+endif
29	+
30	+ifdef ARCH_PPC
31	ifneq ($(AS),)	24	ifneq ($(AS),)
32	SRCS += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \	25	SRCS += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \
33	common/ppc/quant.c common/ppc/deblock.c \	26	common/ppc/quant.c common/ppc/deblock.c \
34	@@ -113,7 +120,7 @@ endif	27	@@ -115,7 +115,7 @@ endif
35	endif	28	endif
36		29
37	# NEON optims	30	# NEON optims
38	-ifeq ($(ARCH),ARM)	31	-ifeq ($(SYS_ARCH),ARM)
39	+ifeq ($(ARCH),armv6)	32	+ifeq ($(SYS_ARCH),armv6)
40	ifneq ($(AS),)	33	ifneq ($(AS),)
41	ASMSRC += common/arm/cpu-a.S common/arm/pixel-a.S common/arm/mc-a.S \	34	ASMSRC += common/arm/cpu-a.S common/arm/pixel-a.S common/arm/mc-a.S \
42	common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \	35	common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \
		36	@@ -126,7 +126,7 @@ endif
		37	endif
		38
		39	# AArch64 NEON optims
		40	-ifeq ($(SYS_ARCH),AARCH64)
		41	+ifeq ($(SYS_ARCH),arm64)
		42	ifneq ($(AS),)
		43	ASMSRC += common/aarch64/bitstream-a.S \
		44	common/aarch64/cabac-a.S \

Lines 1-29 Link Here

(-)x264/files/patch-common_cpu.c (-29 lines)
1	--- common/cpu.c.orig 2014-08-27 20:45:08 UTC
2	+++ common/cpu.c
3	@@ -313,7 +313,7 @@ uint32_t x264_cpu_detect( void )
4
5	#elif ARCH_PPC
6
7	-#if SYS_MACOSX \|\| SYS_OPENBSD
8	+#if SYS_MACOSX \|\| SYS_OPENBSD \|\| SYS_FREEBSD
9	#include <sys/sysctl.h>
10	uint32_t x264_cpu_detect( void )
11	{
12	@@ -321,12 +321,16 @@ uint32_t x264_cpu_detect( void )
13	uint32_t cpu = 0;
14	#if SYS_OPENBSD
15	int selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC };
16	-#else
17	+#elif SYS_MACOSX
18	int selectors[2] = { CTL_HW, HW_VECTORUNIT };
19	#endif
20	int has_altivec = 0;
21	size_t length = sizeof( has_altivec );
22	+#if SYS_MACOSX \|\| SYS_OPENBSD
23	int error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 );
24	+#else
25	+ int error = sysctlbyname("hw.altivec", &has_altivec, &length, NULL, 0 );
26	+#endif
27
28	if( error == 0 && has_altivec != 0 )
29	cpu \|= X264_CPU_ALTIVEC;

Lines 1-25 Link Here

(-)x264/files/patch-configure (-25 lines)
1	From 9463ec0004f1bddc49c05ed8e38430a4ce1738fb Mon Sep 17 00:00:00 2001
2	From: Janne Grunau <janne-x264@jannau.net>
3	Date: Sun, 20 Jul 2014 13:40:28 +0200
4	Subject: [PATCH] arm/ppc: use $CC as default assembler
5
6	--- configure.orig 2014-08-27 20:45:08 UTC
7	+++ configure
8	@@ -648,7 +648,7 @@ case $host_cpu in
9	ARCH="PPC"
10	if [ $asm = auto ] ; then
11	define HAVE_ALTIVEC
12	- AS="${AS-${cross_prefix}gcc}"
13	+ AS="${AS-${CC}}"
14	if [ $SYS = MACOSX ] ; then
15	CFLAGS="$CFLAGS -faltivec -fastf -mcpu=G4"
16	else
17	@@ -674,7 +674,7 @@ case $host_cpu in
18	LDFLAGS="$LDFLAGS -arch armv7"
19	fi
20	else
21	- AS="${AS-${cross_prefix}gcc}"
22	+ AS="${AS-${CC}}"
23	fi
24	;;
25	s390\|s390x)