Attachment #209211 for bug #241928

View | Details | Raw Unified | Return to bug 241928 | Differences between
Collapse All | Expand All




LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

ONLY_FOR_ARCHS=	amd64 i386 powerpc64
ONLY_FOR_ARCHS_REASON=	invokes x86 assembler

BUILD_DEPENDS=	bash:shells/bash \
		nasm:devel/nasm \

.endif

GNU_CONFIGURE=	yes
USES=		autoreconf:build compiler:c11 gmake iconv \
		libtool:build localbase:ldflags pkgconfig python:2.7,build
MAKE_ENV=	V=1 ACLOCAL=${LOCALBASE}/bin/aclocal


		gnome=gtk30,intltool,cairo,gdkpixbuf2

# HandBrake tries to fetch its dependencies during build phase, which is not
# considered good in FreeBSD.  Instead, we will provide the downloaded files.
post-extract: .SILENT
	${MKDIR} ${WRKSRC}/download
.for f in ${CONTRIB_FILES}




--- contrib/libvpx/P05-freebsd-ppc.patch.orig	2019-11-12 14:12:26 UTC
+++ contrib/libvpx/P05-freebsd-ppc.patch
@@ -0,0 +1,11 @@
+--- libvpx-1.7.0/vpx_ports/ppc_cpudetect.c.orig	2019-11-12 15:11:30.139706000 +0100
++++ libvpx-1.7.0/vpx_ports/ppc_cpudetect.c
+@@ -11,8 +11,6 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <stdint.h>
+-#include <asm/cputable.h>
+-#include <linux/auxvec.h>
+ 
+ #include "./vpx_config.h"
+ #include "vpx_ports/ppc.h"




--- contrib/x265/P01-freebsd-ppc.patch.orig	2019-11-12 19:13:27 UTC
+++ contrib/x265/P01-freebsd-ppc.patch
@@ -0,0 +1,50 @@
+--- x265_2.9/source/common/cpu.cpp.orig	2019-11-12 20:19:28.629150000 +0100
++++ x265_2.9/source/common/cpu.cpp
+@@ -127,6 +127,7 @@
+ {
+     return(enable512);
+ }
++
+ uint32_t cpu_detect(bool benableavx512 )
+ {
+ 
+--- x265_2.9/source/common/quant.cpp.orig	2019-11-12 20:19:34.848807000 +0100
++++ x265_2.9/source/common/quant.cpp
+@@ -723,6 +723,7 @@
+             X265_CHECK(coeffNum[cgScanPos] == 0, "count of coeff failure\n");
+             uint32_t scanPosBase = (cgScanPos << MLS_CG_SIZE);
+             uint32_t blkPos      = codeParams.scan[scanPosBase];
++#if X265_ARCH_X86
+             bool enable512 = detect512();
+             if (enable512)
+                 primitives.cu[log2TrSize - 2].psyRdoQuant(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);
+@@ -731,6 +732,10 @@
+                 primitives.cu[log2TrSize - 2].psyRdoQuant_1p(m_resiDctCoeff,  costUncoded, &totalUncodedCost, &totalRdCost,blkPos);
+                 primitives.cu[log2TrSize - 2].psyRdoQuant_2p(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);
+             }
++#else

--- make/variant/freebsd.defs.orig	2019-02-22 17:23:51.000000000 +0100
+++ make/variant/freebsd.defs	2019-11-17 20:08:28.821497000 +0100
@@ -15,4 +15,4 @@
 
 GCC.MAJOR_VERSION = $(shell $(GCC.gcc) -dumpversion | cut -f 1 -d .)
 GCC.LDFLAGS = -lc++ -Wl,-rpath=$(LOCALBASE)/lib/gcc$(GCC.MAJOR_VERSION)
-LDFLAGS += $(if $(findstring gcc, $(GCC.gcc)), $(GCC.LDFLAGS), )
+LDFLAGS += $(if $(findstring gcc, $(GCC.gcc)), $(if $(findstring x86, $(GCC.archs)), $(GCC.LDFLAGS), ), )

Return to bug 241928

Lines 13-20 Link Here

(-)Makefile (-4 / +3 lines)
13	LICENSE= GPLv2	13	LICENSE= GPLv2
14	LICENSE_FILE= ${WRKSRC}/COPYING	14	LICENSE_FILE= ${WRKSRC}/COPYING
15		15
16	ONLY_FOR_ARCHS= amd64 i386	16	ONLY_FOR_ARCHS= amd64 i386 powerpc64
17	ONLY_FOR_ARCHS_REASON= invokes x86 assembler
18		17
19	BUILD_DEPENDS= bash:shells/bash \	18	BUILD_DEPENDS= bash:shells/bash \
20	nasm:devel/nasm \	19	nasm:devel/nasm \
Lines 54-60 Link Here
54	.endif	53	.endif
55		54
56	GNU_CONFIGURE= yes	55	GNU_CONFIGURE= yes
57	USES= autoreconf:build compiler:features gmake iconv \	56	USES= autoreconf:build compiler:c11 gmake iconv \
58	libtool:build localbase:ldflags pkgconfig python:2.7,build	57	libtool:build localbase:ldflags pkgconfig python:2.7,build
59	MAKE_ENV= V=1 ACLOCAL=${LOCALBASE}/bin/aclocal	58	MAKE_ENV= V=1 ACLOCAL=${LOCALBASE}/bin/aclocal
60		59
Lines 101-107 Link Here
101	gnome=gtk30,intltool,cairo,gdkpixbuf2	100	gnome=gtk30,intltool,cairo,gdkpixbuf2
102		101
103	# HandBrake tries to fetch its dependencies during build phase, which is not	102	# HandBrake tries to fetch its dependencies during build phase, which is not
104	# considered good in FreeBSD. Instead, we will provided the downloaded files.	103	# considered good in FreeBSD. Instead, we will provide the downloaded files.
105	post-extract: .SILENT	104	post-extract: .SILENT
106	${MKDIR} ${WRKSRC}/download	105	${MKDIR} ${WRKSRC}/download
107	.for f in ${CONTRIB_FILES}	106	.for f in ${CONTRIB_FILES}

Line 0 Link Here

(-)files/patch-contrib_libvpx_P05-freebsd-ppc.patch (+14 lines)
	1	--- contrib/libvpx/P05-freebsd-ppc.patch.orig 2019-11-12 14:12:26 UTC
	2	+++ contrib/libvpx/P05-freebsd-ppc.patch
	3	@@ -0,0 +1,11 @@
	4	+--- libvpx-1.7.0/vpx_ports/ppc_cpudetect.c.orig 2019-11-12 15:11:30.139706000 +0100
	5	++++ libvpx-1.7.0/vpx_ports/ppc_cpudetect.c
	6	+@@ -11,8 +11,6 @@
	7	+ #include <fcntl.h>
	8	+ #include <unistd.h>
	9	+ #include <stdint.h>
	10	+-#include <asm/cputable.h>
	11	+-#include <linux/auxvec.h>
	12	+
	13	+ #include "./vpx_config.h"
	14	+ #include "vpx_ports/ppc.h"

Line 0 Link Here

(-)files/patch-make_variant_freebsd.defs (+36 lines)
	1	--- contrib/x265/P01-freebsd-ppc.patch.orig 2019-11-12 19:13:27 UTC
	2	+++ contrib/x265/P01-freebsd-ppc.patch
	3	@@ -0,0 +1,50 @@
	4	+--- x265_2.9/source/common/cpu.cpp.orig 2019-11-12 20:19:28.629150000 +0100
	5	++++ x265_2.9/source/common/cpu.cpp
	6	+@@ -127,6 +127,7 @@
	7	+ {
	8	+ return(enable512);
	9	+ }
	10	++
	11	+ uint32_t cpu_detect(bool benableavx512 )
	12	+ {
	13	+
	14	+--- x265_2.9/source/common/quant.cpp.orig 2019-11-12 20:19:34.848807000 +0100
	15	++++ x265_2.9/source/common/quant.cpp
	16	+@@ -723,6 +723,7 @@
	17	+ X265_CHECK(coeffNum[cgScanPos] == 0, "count of coeff failure\n");
	18	+ uint32_t scanPosBase = (cgScanPos << MLS_CG_SIZE);
	19	+ uint32_t blkPos = codeParams.scan[scanPosBase];
	20	++#if X265_ARCH_X86
	21	+ bool enable512 = detect512();
	22	+ if (enable512)
	23	+ primitives.cu[log2TrSize - 2].psyRdoQuant(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);
	24	+@@ -731,6 +732,10 @@
	25	+ primitives.cu[log2TrSize - 2].psyRdoQuant_1p(m_resiDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost,blkPos);
	26	+ primitives.cu[log2TrSize - 2].psyRdoQuant_2p(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);
	27	+ }
	28	++#else
Line 0 Link Here
	1	--- make/variant/freebsd.defs.orig 2019-02-22 17:23:51.000000000 +0100
	2	+++ make/variant/freebsd.defs 2019-11-17 20:08:28.821497000 +0100
	3	@@ -15,4 +15,4 @@
	4
	5	GCC.MAJOR_VERSION = $(shell $(GCC.gcc) -dumpversion \| cut -f 1 -d .)
	6	GCC.LDFLAGS = -lc++ -Wl,-rpath=$(LOCALBASE)/lib/gcc$(GCC.MAJOR_VERSION)
	7	-LDFLAGS += $(if $(findstring gcc, $(GCC.gcc)), $(GCC.LDFLAGS), )
	8	+LDFLAGS += $(if $(findstring gcc, $(GCC.gcc)), $(if $(findstring x86, $(GCC.archs)), $(GCC.LDFLAGS), ), )