Attachment 209211 Details for Bug 241928 – v2

[patch] v2

handbrake.patch (text/plain), 6.38 KB, created by Piotr Kubaj on 2019-11-17 19:38:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2019-11-17 19:38:07 UTC

Size: 6.38 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 517364)
>+++ Makefile	(working copy)
>@@ -13,8 +13,7 @@
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-ONLY_FOR_ARCHS=	amd64 i386
>-ONLY_FOR_ARCHS_REASON=	invokes x86 assembler
>+ONLY_FOR_ARCHS=	amd64 i386 powerpc64
> 
> BUILD_DEPENDS=	bash:shells/bash \
> 		nasm:devel/nasm \
>@@ -54,7 +53,7 @@
> .endif
> 
> GNU_CONFIGURE=	yes
>-USES=		autoreconf:build compiler:features gmake iconv \
>+USES=		autoreconf:build compiler:c11 gmake iconv \
> 		libtool:build localbase:ldflags pkgconfig python:2.7,build
> MAKE_ENV=	V=1 ACLOCAL=${LOCALBASE}/bin/aclocal
> 
>@@ -101,7 +100,7 @@
> 		gnome=gtk30,intltool,cairo,gdkpixbuf2
> 
> # HandBrake tries to fetch its dependencies during build phase, which is not
>-# considered good in FreeBSD.  Instead, we will provided the downloaded files.
>+# considered good in FreeBSD.  Instead, we will provide the downloaded files.
> post-extract: .SILENT
> 	${MKDIR} ${WRKSRC}/download
> .for f in ${CONTRIB_FILES}
>Index: files/patch-contrib_libvpx_P05-freebsd-ppc.patch
>===================================================================
>--- files/patch-contrib_libvpx_P05-freebsd-ppc.patch	(nonexistent)
>+++ files/patch-contrib_libvpx_P05-freebsd-ppc.patch	(working copy)
>@@ -0,0 +1,14 @@
>+--- 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"
>
>Property changes on: files/patch-contrib_libvpx_P05-freebsd-ppc.patch
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-contrib_x265_P01-freebsd-ppc.patch
>===================================================================
>--- files/patch-contrib_x265_P01-freebsd-ppc.patch	(nonexistent)
>+++ files/patch-contrib_x265_P01-freebsd-ppc.patch	(working copy)
>@@ -0,0 +1,53 @@
>+--- 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
>+++		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);
>+++#endif
>++         }
>++     }
>++     else
>++@@ -805,6 +810,7 @@
>++             uint32_t blkPos = codeParams.scan[scanPosBase];
>++             if (usePsyMask)
>++             {
>+++#if X265_ARCH_X86
>++                 bool enable512 = detect512();
>++ 
>++                 if (enable512)
>++@@ -814,6 +820,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
>+++                    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);
>+++#endif
>++                 blkPos = codeParams.scan[scanPosBase];
>++                 for (int y = 0; y < MLS_CG_SIZE; y++)
>++                 {
>
>Property changes on: files/patch-contrib_x265_P01-freebsd-ppc.patch
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-make_variant_freebsd.defs
>===================================================================
>--- files/patch-make_variant_freebsd.defs	(nonexistent)
>+++ files/patch-make_variant_freebsd.defs	(working copy)
>@@ -0,0 +1,8 @@
>+--- 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), ), )
>
>Property changes on: files/patch-make_variant_freebsd.defs
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

pkubaj: maintainer-approval? (naito.yuichiro)

Actions: View | Diff

Attachments on bug 241928: 209112 | 209211