View | Details | Raw Unified | Return to bug 241902 | Differences between
and this patch

Collapse All | Expand All

(-)multimedia/handbrake/Makefile (-13 / +17 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	handbrake
4
PORTNAME=	handbrake
5
DISTVERSION=	1.2.2
5
DISTVERSION=	1.3.0
6
PORTREVISION=	1
7
CATEGORIES=	multimedia
6
CATEGORIES=	multimedia
8
DIST_SUBDIR=	${PORTNAME}
7
DIST_SUBDIR=	${PORTNAME}
9
8
Lines 17-23 Link Here
17
16
18
BUILD_DEPENDS=	bash:shells/bash \
17
BUILD_DEPENDS=	bash:shells/bash \
19
		nasm:devel/nasm \
18
		nasm:devel/nasm \
20
		cmake:devel/cmake
19
		cmake:devel/cmake \
20
		meson:devel/meson
21
LIB_DEPENDS=	libdbus-1.so:devel/dbus \
21
LIB_DEPENDS=	libdbus-1.so:devel/dbus \
22
		libharfbuzz.so:print/harfbuzz \
22
		libharfbuzz.so:print/harfbuzz \
23
		libfontconfig.so:x11-fonts/fontconfig \
23
		libfontconfig.so:x11-fonts/fontconfig \
Lines 31-50 Link Here
31
		libvorbisenc.so:audio/libvorbis \
31
		libvorbisenc.so:audio/libvorbis \
32
		libtheoradec.so:multimedia/libtheora \
32
		libtheoradec.so:multimedia/libtheora \
33
		libtheoraenc.so:multimedia/libtheora \
33
		libtheoraenc.so:multimedia/libtheora \
34
		libsamplerate.so:audio/libsamplerate \
35
		libx264.so:multimedia/libx264 \
34
		libx264.so:multimedia/libx264 \
35
		libvpx.so:multimedia/libvpx \
36
		libmp3lame.so:audio/lame \
36
		libmp3lame.so:audio/lame \
37
		libopus.so:audio/opus \
37
		libopus.so:audio/opus \
38
		libjansson.so:devel/jansson
38
		libjansson.so:devel/jansson
39
39
40
CONTRIB_FILES=	fdk-aac-0.1.5.tar.gz \
40
USES=		autoreconf:build compiler:c11 gmake iconv \
41
		ffmpeg-4.1.tar.bz2 \
41
		libtool:build localbase:ldflags pkgconfig python:3.6+,build
42
		libbluray-1.0.2.tar.bz2 \
42
43
		libdvdnav-6.0.0.tar.bz2 \
43
CONTRIB_FILES=	fdk-aac-2.0.1.tar.gz \
44
		libdvdread-6.0.0.tar.bz2 \
44
		ffmpeg-4.2.1.tar.bz2 \
45
		libvpx-1.7.0.tar.gz \
45
		libbluray-1.1.2.tar.bz2 \
46
		x265_2.9.tar.gz
46
		libdvdnav-6.0.1.tar.bz2 \
47
		libdvdread-6.0.2.tar.bz2 \
48
		dav1d-0.5.1.tar.bz2 \
49
		x265_3.2.1.tar.gz
47
MASTER_SITES+=	https://download.handbrake.fr/contrib/:contrib
50
MASTER_SITES+=	https://download.handbrake.fr/contrib/:contrib
51
48
DISTFILES+=	${CONTRIB_FILES:S/$/:contrib/}
52
DISTFILES+=	${CONTRIB_FILES:S/$/:contrib/}
49
53
50
.if !defined(PACKAGE_BUILDING)
54
.if !defined(PACKAGE_BUILDING)
Lines 53-62 Link Here
53
.endif
57
.endif
54
58
55
GNU_CONFIGURE=	yes
59
GNU_CONFIGURE=	yes
56
USES=		autoreconf:build compiler:c11 gmake iconv \
57
		libtool:build localbase:ldflags pkgconfig python:2.7,build
58
MAKE_ENV=	V=1 ACLOCAL=${LOCALBASE}/bin/aclocal
60
MAKE_ENV=	V=1 ACLOCAL=${LOCALBASE}/bin/aclocal
59
61
62
BINARY_ALIAS=   python3=${PYTHON_VERSION}
63
60
USE_GITHUB=	yes
64
USE_GITHUB=	yes
61
GH_ACCOUNT=	HandBrake
65
GH_ACCOUNT=	HandBrake
62
GH_PROJECT=	HandBrake
66
GH_PROJECT=	HandBrake
(-)multimedia/handbrake/distinfo (-17 / +17 lines)
Lines 1-17 Link Here
1
TIMESTAMP = 1551058103
1
TIMESTAMP = 1573434561
2
SHA256 (handbrake/fdk-aac-0.1.5.tar.gz) = 2164592a67b467e5b20fdcdaf5bd4c50685199067391c6fcad4fa5521c9b4dd7
2
SHA256 (handbrake/fdk-aac-2.0.1.tar.gz) = a4142815d8d52d0e798212a5adea54ecf42bcd4eec8092b37a8cb615ace91dc6
3
SIZE (handbrake/fdk-aac-0.1.5.tar.gz) = 2091081
3
SIZE (handbrake/fdk-aac-2.0.1.tar.gz) = 2488373
4
SHA256 (handbrake/ffmpeg-4.1.tar.bz2) = b684fb43244a5c4caae652af9022ed5d85ce15210835bce054a33fb26033a1a5
4
SHA256 (handbrake/ffmpeg-4.2.1.tar.bz2) = 682a9fa3f6864d7f0dbf224f86b129e337bc60286e0d00dffcd710998d521624
5
SIZE (handbrake/ffmpeg-4.1.tar.bz2) = 10687291
5
SIZE (handbrake/ffmpeg-4.2.1.tar.bz2) = 10953293
6
SHA256 (handbrake/libbluray-1.0.2.tar.bz2) = 6d9e7c4e416f664c330d9fa5a05ad79a3fb39b95adfc3fd6910cbed503b7aeff
6
SHA256 (handbrake/libbluray-1.1.2.tar.bz2) = a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42
7
SIZE (handbrake/libbluray-1.0.2.tar.bz2) = 733058
7
SIZE (handbrake/libbluray-1.1.2.tar.bz2) = 745779
8
SHA256 (handbrake/libdvdnav-6.0.0.tar.bz2) = f0a2711b08a021759792f8eb14bb82ff8a3c929bf88c33b64ffcddaa27935618
8
SHA256 (handbrake/libdvdnav-6.0.1.tar.bz2) = e566a396f1950017088bfd760395b0565db44234195ada5413366c9d23926733
9
SIZE (handbrake/libdvdnav-6.0.0.tar.bz2) = 369605
9
SIZE (handbrake/libdvdnav-6.0.1.tar.bz2) = 378491
10
SHA256 (handbrake/libdvdread-6.0.0.tar.bz2) = b33b1953b4860545b75f6efc06e01d9849e2ea4f797652263b0b4af6dd10f935
10
SHA256 (handbrake/libdvdread-6.0.2.tar.bz2) = f91401af213b219cdde24b46c50a57f29301feb7f965678f1d7ed4632cc6feb0
11
SIZE (handbrake/libdvdread-6.0.0.tar.bz2) = 394627
11
SIZE (handbrake/libdvdread-6.0.2.tar.bz2) = 405298
12
SHA256 (handbrake/libvpx-1.7.0.tar.gz) = 1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238
12
SHA256 (handbrake/dav1d-0.5.1.tar.bz2) = 0214d201a338e8418f805b68f9ad277e33d79c18594dee6eaf6dcd74db2674a9
13
SIZE (handbrake/libvpx-1.7.0.tar.gz) = 2679797
13
SIZE (handbrake/dav1d-0.5.1.tar.bz2) = 548584
14
SHA256 (handbrake/x265_2.9.tar.gz) = ebae687c84a39f54b995417c52a2fdde65a4e2e7ebac5730d251471304b91024
14
SHA256 (handbrake/x265_3.2.1.tar.gz) = fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc
15
SIZE (handbrake/x265_2.9.tar.gz) = 1385848
15
SIZE (handbrake/x265_3.2.1.tar.gz) = 1426255
16
SHA256 (handbrake/HandBrake-HandBrake-1.2.2_GH0.tar.gz) = 068e5117c3d4e170b49122989d240caab2ddd1e8923ff4de9ede37a30db23bec
16
SHA256 (handbrake/HandBrake-HandBrake-1.3.0_GH0.tar.gz) = d31c6f669da5f49b60ff2d04f5c5906e15fc5e81563331333e3f862e4e48668b
17
SIZE (handbrake/HandBrake-HandBrake-1.2.2_GH0.tar.gz) = 18635387
17
SIZE (handbrake/HandBrake-HandBrake-1.3.0_GH0.tar.gz) = 17908235
(-)multimedia/handbrake/files/patch-contrib_libvpx_P05-freebsd-ppc.patch (-14 / +16 lines)
Line 0 Link Here
1
--- contrib/ffmpeg/A14-altivec.patch.orig	2019-11-30 18:44:22 UTC
2
+++ contrib/ffmpeg/A14-altivec.patch
3
@@ -0,0 +1,55 @@
4
+--- a/libswscale/ppc/swscale_altivec.c.orig	2019-08-11 20:06:32 UTC
5
++++ b/libswscale/ppc/swscale_altivec.c
6
+@@ -153,13 +153,13 @@ static void yuv2plane1_float_altivec(const int32_t *sr
7
+     const int add = (1 << (shift - 1));
8
+     const int clip = (1 << 16) - 1;
9
+     const float fmult = 1.0f / 65535.0f;
10
+-    const vector uint32_t vadd = (vector uint32_t) {add, add, add, add};
11
+-    const vector uint32_t vshift = (vector uint32_t) vec_splat_u32(shift);
12
+-    const vector uint32_t vlargest = (vector uint32_t) {clip, clip, clip, clip};
13
+-    const vector float vmul = (vector float) {fmult, fmult, fmult, fmult};
14
+-    const vector float vzero = (vector float) {0, 0, 0, 0};
15
+-    vector uint32_t v;
16
+-    vector float vd;
Lines 1-14 Link Here
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"
(-)multimedia/handbrake/files/patch-contrib_x265_P01-freebsd-ppc.patch (-53 lines)
Lines 1-53 Link Here
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
29
++		primitives.cu[log2TrSize - 2].psyRdoQuant_1p(m_resiDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, blkPos);
30
++		primitives.cu[log2TrSize - 2].psyRdoQuant_2p(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);
31
++#endif
32
+         }
33
+     }
34
+     else
35
+@@ -805,6 +810,7 @@
36
+             uint32_t blkPos = codeParams.scan[scanPosBase];
37
+             if (usePsyMask)
38
+             {
39
++#if X265_ARCH_X86
40
+                 bool enable512 = detect512();
41
+ 
42
+                 if (enable512)
43
+@@ -814,6 +820,10 @@
44
+                     primitives.cu[log2TrSize - 2].psyRdoQuant_1p(m_resiDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, blkPos);
45
+                     primitives.cu[log2TrSize - 2].psyRdoQuant_2p(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);
46
+                 }
47
++#else
48
++                    primitives.cu[log2TrSize - 2].psyRdoQuant_1p(m_resiDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, blkPos);
49
++                    primitives.cu[log2TrSize - 2].psyRdoQuant_2p(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);
50
++#endif
51
+                 blkPos = codeParams.scan[scanPosBase];
52
+                 for (int y = 0; y < MLS_CG_SIZE; y++)
53
+                 {
(-)multimedia/handbrake/files/patch-gtk_src_Makefile.am (+11 lines)
Line 0 Link Here
1
--- gtk/src/Makefile.am.orig	2019-11-09 20:44:32 UTC
2
+++ gtk/src/Makefile.am
3
@@ -51,7 +51,7 @@ DISTCLEANFILES = \
4
 	$(appdata_files)
5
 
6
 AM_CPPFLAGS = \
7
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
8
+	-DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \
9
 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
10
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
11
 	$(GHB_CFLAGS)
(-)multimedia/handbrake/files/patch-make_variant_freebsd.defs (-4 / +4 lines)
Lines 1-8 Link Here
1
--- make/variant/freebsd.defs.orig	2019-02-22 17:23:51.000000000 +0100
1
--- make/variant/freebsd.defs.orig	2019-11-09 20:44:32 UTC
2
+++ make/variant/freebsd.defs	2019-11-17 20:08:28.821497000 +0100
2
+++ make/variant/freebsd.defs
3
@@ -15,4 +15,4 @@
3
@@ -15,4 +15,4 @@ GCC.args.g.max  = -g3
4
 
4
 
5
 GCC.MAJOR_VERSION = $(shell $(GCC.gcc) -dumpversion | cut -f 1 -d .)
5
 GCC.MAJOR_VERSION = $(shell $(GCC.gcc) -dumpversion | cut -f 1 -d .)
6
 GCC.LDFLAGS = -lc++ -Wl,-rpath=$(LOCALBASE)/lib/gcc$(GCC.MAJOR_VERSION)
6
 GCC.LDFLAGS = -lc++ -Wl,-rpath=$(LOCALBASE)/lib/gcc$(GCC.MAJOR_VERSION)
7
-LDFLAGS += $(if $(findstring gcc, $(GCC.gcc)), $(GCC.LDFLAGS), )
7
-LDFLAGS += $(if $(findstring gcc, $(GCC.gcc)), $(GCC.LDFLAGS), )
8
+LDFLAGS += $(if $(findstring gcc, $(GCC.gcc)), $(if $(findstring x86, $(GCC.archs)), $(GCC.LDFLAGS), ), )
8
+LDFLAGS += $(if $(findstring gcc, $(GCC.gcc)), $(if $(shell /usr/bin/clang -dumpversion 2> /dev/null), $(GCC.LDFLAGS), ), )
(-)multimedia/handbrake/files/version.txt (-5 / +5 lines)
Lines 1-9 Link Here
1
URL=https://github.com/HandBrake/HandBrake.git
1
URL=https://github.com/HandBrake/HandBrake.git
2
HASH=4eb9f7b2f925620cc346ab186010a6e5711a5cc8
2
HASH=4672248655ddd687161bacdb539c208abde15c59
3
SHORTHASH=4eb9f7b2f
3
SHORTHASH=467224865
4
TAG=1.2.2
4
TAG=1.3.0
5
TAG_HASH=4eb9f7b2f925620cc346ab186010a6e5711a5cc8
5
TAG_HASH=4672248655ddd687161bacdb539c208abde15c59
6
REV=0
6
REV=0
7
BRANCH=
7
BRANCH=
8
REMOTE=https://github.com/HandBrake/HandBrake.git
8
REMOTE=https://github.com/HandBrake/HandBrake.git
9
DATE=2019-02-22 17:23:51 +0100
9
DATE=2019-11-09 15:44:32 -0500
(-)multimedia/handbrake/pkg-descr (-1 / +1 lines)
Lines 12-18 Link Here
12
12
13
  * File (container) format: MP4 (M4V) and MKV
13
  * File (container) format: MP4 (M4V) and MKV
14
  * Video: H.264 (x264), H.265 (x265), MPEG-2/MPEG-4 (ffmpeg),
14
  * Video: H.264 (x264), H.265 (x265), MPEG-2/MPEG-4 (ffmpeg),
15
           or Theora (libtheora)
15
           VP8, VP9 (libvpx) or Theora (libtheora)
16
  * Audio: AAC, CoreAudio AAC/HE-AAC (OS X only), MP3, FLAC, AC3, or Vorbis;
16
  * Audio: AAC, CoreAudio AAC/HE-AAC (OS X only), MP3, FLAC, AC3, or Vorbis;
17
    AC-3, DTS, DTS-HD, AAC, and MP3 pass-through
17
    AC-3, DTS, DTS-HD, AAC, and MP3 pass-through
18
18
(-)multimedia/handbrake/pkg-plist (-3 / +13 lines)
Lines 4-21 Link Here
4
%%X11%%share/applications/fr.handbrake.ghb.desktop
4
%%X11%%share/applications/fr.handbrake.ghb.desktop
5
%%X11%%share/icons/hicolor/scalable/apps/hb-icon.svg
5
%%X11%%share/icons/hicolor/scalable/apps/hb-icon.svg
6
%%X11%%share/icons/hicolor/scalable/apps/fr.handbrake.ghb.svg
6
%%X11%%share/icons/hicolor/scalable/apps/fr.handbrake.ghb.svg
7
%%X11%%share/locale/af/LC_MESSAGES/ghb.mo
7
%%X11%%share/locale/cs/LC_MESSAGES/ghb.mo
8
%%X11%%share/locale/cs/LC_MESSAGES/ghb.mo
8
%%X11%%share/locale/da/LC_MESSAGES/ghb.mo
9
%%X11%%share/locale/da/LC_MESSAGES/ghb.mo
9
%%X11%%share/locale/de/LC_MESSAGES/ghb.mo
10
%%X11%%share/locale/de/LC_MESSAGES/ghb.mo
10
%%X11%%share/locale/es/LC_MESSAGES/ghb.mo
11
%%X11%%share/locale/es/LC_MESSAGES/ghb.mo
12
%%X11%%share/locale/eu/LC_MESSAGES/ghb.mo
11
%%X11%%share/locale/fr/LC_MESSAGES/ghb.mo
13
%%X11%%share/locale/fr/LC_MESSAGES/ghb.mo
12
%%X11%%share/locale/it_IT/LC_MESSAGES/ghb.mo
14
%%X11%%share/locale/hr/LC_MESSAGES/ghb.mo
13
%%X11%%share/locale/ja_JP/LC_MESSAGES/ghb.mo
15
%%X11%%share/locale/it/LC_MESSAGES/ghb.mo
16
%%X11%%share/locale/ja/LC_MESSAGES/ghb.mo
14
%%X11%%share/locale/ko/LC_MESSAGES/ghb.mo
17
%%X11%%share/locale/ko/LC_MESSAGES/ghb.mo
18
%%X11%%share/locale/nl/LC_MESSAGES/ghb.mo
15
%%X11%%share/locale/no/LC_MESSAGES/ghb.mo
19
%%X11%%share/locale/no/LC_MESSAGES/ghb.mo
20
%%X11%%share/locale/pl/LC_MESSAGES/ghb.mo
21
%%X11%%share/locale/pt/LC_MESSAGES/ghb.mo
16
%%X11%%share/locale/pt_BR/LC_MESSAGES/ghb.mo
22
%%X11%%share/locale/pt_BR/LC_MESSAGES/ghb.mo
17
%%X11%%share/locale/ro_RO/LC_MESSAGES/ghb.mo
23
%%X11%%share/locale/ro/LC_MESSAGES/ghb.mo
18
%%X11%%share/locale/ru/LC_MESSAGES/ghb.mo
24
%%X11%%share/locale/ru/LC_MESSAGES/ghb.mo
25
%%X11%%share/locale/sk/LC_MESSAGES/ghb.mo
26
%%X11%%share/locale/sv/LC_MESSAGES/ghb.mo
19
%%X11%%share/locale/th/LC_MESSAGES/ghb.mo
27
%%X11%%share/locale/th/LC_MESSAGES/ghb.mo
28
%%X11%%share/locale/tr/LC_MESSAGES/ghb.mo
29
%%X11%%share/locale/uk_UA/LC_MESSAGES/ghb.mo
20
%%X11%%share/locale/zh_CN/LC_MESSAGES/ghb.mo
30
%%X11%%share/locale/zh_CN/LC_MESSAGES/ghb.mo
21
%%X11%%share/metainfo/fr.handbrake.ghb.appdata.xml
31
%%X11%%share/metainfo/fr.handbrake.ghb.appdata.xml

Return to bug 241902