haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

handbrake: bump version

Browse Source
This commit is contained in:
Sergei Reznikov
2019-10-22 13:46:43 +03:00
parent cbe3eb05e2
commit 7d779e12a7
4 changed files with 150 additions and 4496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
media-video/handbrake/handbrake-0.10.5.recipe
View File

@@ -1,127 +0,0 @@
SUMMARY="A tool to convert video from nearly any format to modern codecs"
DESCRIPTION="Handbrake is an open-source, GPL-licensed, multiplatform, \
multithreaded video transcoder.
Convert from many common multimedia file formats, including unprotected \
DVD or BluRay sources to a handful of modern output file formats."
HOMEPAGE="http://handbrake.fr/"
LICENSE="GNU GPL v2"
COPYRIGHT="2003-2016 HandBrake Team"
REVISION="4"
SOURCE_URI="http://download.handbrake.fr/releases/$portVersion/HandBrake-$portVersion.tar.bz2"
CHECKSUM_SHA256="fb9230dd121b456f6829d1d25ac8bbf76e503b51c4efc70f0a7fd2bb8607e2f0"
SOURCE_DIR="HandBrake-$portVersion"
PATCHES="handbrake-$portVersion.patchset"
ADDITIONAL_FILES="HandBrake.rdef"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
handbrake$secondaryArchSuffix = $portVersion
cmd:HandBrakeCLI
# app:HandBrake
"
REQUIRES="
haiku$secondaryArchSuffix
lib:liba52$secondaryArchSuffix
lib:libavcodec$secondaryArchSuffix >= 57
lib:libmpeg2$secondaryArchSuffix
lib:libmp4v2$secondaryArchSuffix
lib:libogg$secondaryArchSuffix
lib:libtheora$secondaryArchSuffix
lib:libbluray$secondaryArchSuffix
lib:libdvdnav$secondaryArchSuffix
lib:libdvdread$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libsamplerate$secondaryArchSuffix
lib:libmkv$secondaryArchSuffix
lib:libmp3lame$secondaryArchSuffix
lib:libass$secondaryArchSuffix
lib:libx264$secondaryArchSuffix
lib:libvorbis$secondaryArchSuffix
lib:libvpx$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
lib:libfontconfig$secondaryArchSuffix
lib:libfribidi$secondaryArchSuffix
lib:libbz2$secondaryArchSuffix
lib:libz$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:liba52$secondaryArchSuffix
devel:libavcodec$secondaryArchSuffix >= 57
devel:libmpeg2$secondaryArchSuffix
devel:libmp4v2$secondaryArchSuffix
devel:libogg$secondaryArchSuffix
devel:libtheora$secondaryArchSuffix
devel:libbluray$secondaryArchSuffix
devel:libdvdnav$secondaryArchSuffix
devel:libdvdread$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
devel:libsamplerate$secondaryArchSuffix
devel:libmkv$secondaryArchSuffix
devel:libmp3lame$secondaryArchSuffix
devel:libass$secondaryArchSuffix
devel:libx264$secondaryArchSuffix
devel:libvorbis$secondaryArchSuffix
devel:libvpx$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
devel:libfontconfig$secondaryArchSuffix
devel:libfribidi$secondaryArchSuffix
devel:libbz2$secondaryArchSuffix
devel:libz$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:make
cmd:libtoolize$secondaryArchSuffix
cmd:autoconf
cmd:automake
cmd:patch
cmd:python
cmd:m4
cmd:sed
cmd:tar
"
# Please check the file state.md in this directory for a detailed description
# of the current state of the HandBrake port
PATCH()
{
sed -i 's/MODULES += contrib\/.*//g' make/include/main.defs
}
BUILD()
{
./configure --prefix=$prefix --force --disable-x265
cd build
make
cd ../haiku
# make
}
INSTALL()
{
cd build
make install
# cd ../haiku
# cp haiku/HandBrake $appsDir
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
local MINOR="`echo "$portVersion" | cut -d. -f3`"
sed \
-e "s|@MAJOR@|$MAJOR|" \
-e "s|@MIDDLE@|$MIDDLE|" \
-e "s|@MINOR@|$MINOR|" \
$portDir/additional-files/HandBrake.rdef > HandBrake.rdef
addResourcesToBinaries HandBrake.rdef $prefix/bin/HandBrakeCLI
# addResourcesToBinaries handBrake.rdef $appsDir/HandBrake
# addAppDeskbarSymlink $appsDir/HandBrake
}

13
media-video/handbrake/handbrake-1.1.2.recipe → media-video/handbrake/handbrake-1.2.2.recipe
View File

@@ -1,14 +1,14 @@
SUMMARY="A tool to convert video from nearly any format to modern codecs"
DESCRIPTION="Handbrake is an open-source, GPL-licensed, multiplatform, \
DESCRIPTION="HandBrake is an open-source, GPL-licensed, multiplatform, \
multithreaded video transcoder.
Convert from many common multimedia file formats, including unprotected \
DVD or BluRay sources to a handful of modern output file formats."
HOMEPAGE="https://handbrake.fr/"
LICENSE="GNU GPL v2"
COPYRIGHT="2003-2018 HandBrake Team"
COPYRIGHT="2003-2019 HandBrake Team"
REVISION="1"
SOURCE_URI="https://download.handbrake.fr/releases/$portVersion/HandBrake-$portVersion-source.tar.bz2"
CHECKSUM_SHA256="ba9a4a90a7657720f04e4ba0a2880ed055be3bd855e99c0c13af944c3904de2e"
CHECKSUM_SHA256="df6816f517d60ae8a6626aa731821af2d1966c155fa53b2b9a06c47f3c565e4c"
SOURCE_DIR="HandBrake-$portVersion"
PATCHES="handbrake-$portVersion.patchset"
ADDITIONAL_FILES="HandBrake.rdef"
@@ -35,12 +35,14 @@ REQUIRES="
lib:libharfbuzz$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libjansson$secondaryArchSuffix
lib:liblzma$secondaryArchSuffix
lib:libmkv$secondaryArchSuffix
lib:libmp3lame$secondaryArchSuffix
lib:libmp4v2$secondaryArchSuffix
lib:libmpeg2$secondaryArchSuffix
lib:libopus$secondaryArchSuffix
lib:libsamplerate$secondaryArchSuffix
lib:libspeex$secondaryArchSuffix
lib:libtheora$secondaryArchSuffix
lib:libvorbis$secondaryArchSuffix
lib:libvpx$secondaryArchSuffix
@@ -60,6 +62,7 @@ BUILD_REQUIRES="
devel:libfreetype$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
devel:libjansson$secondaryArchSuffix
devel:liblzma$secondaryArchSuffix
devel:libmkv$secondaryArchSuffix
devel:libmp3lame$secondaryArchSuffix
devel:libmp4v2$secondaryArchSuffix
@@ -75,7 +78,11 @@ BUILD_REQUIRES="
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:autoconf
cmd:automake
cmd:cmake
cmd:gcc$secondaryArchSuffix
cmd:libtool
cmd:m4
cmd:make
cmd:patch

4217
media-video/handbrake/patches/handbrake-0.10.5.patchset
View File

File diff suppressed because it is too large Load Diff

289
media-video/handbrake/patches/handbrake-1.1.2.patchset → media-video/handbrake/patches/handbrake-1.2.2.patchset
View File

@@ -1,14 +1,14 @@
From 68995c830c51d62715d82b18e9b1a861e2e3f659 Mon Sep 17 00:00:00 2001
From 04d5486daf9df7c7238f0c4aaf1363acee013e90 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 4 Oct 2014 17:43:55 +0000
Subject: define HB_NORMAL_PRIORITY
diff --git a/libhb/ports.h b/libhb/ports.h
index b1b478d..cc84090 100644
index 0a5ad0c..7123646 100644
--- a/libhb/ports.h
+++ b/libhb/ports.h
@@ -112,7 +112,7 @@ void hb_get_user_config_filename( char name[1024], char *fmt, ... );
@@ -111,7 +111,7 @@ void hb_get_user_config_filename( char name[1024], char *fmt, ... );
***********************************************************************/
typedef struct hb_thread_s hb_thread_t;
@@ -18,10 +18,10 @@ index b1b478d..cc84090 100644
# define HB_NORMAL_PRIORITY 10
#elif defined( SYS_DARWIN )
--
2.10.2
2.23.0
From aec83dfd592f64d29613a45d8a4dbf4652431a79 Mon Sep 17 00:00:00 2001
From 5d09c380c56d92d0a7edf14dcf17bbd01e3281e7 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sat, 8 Dec 2012 18:23:16 +0000
Subject: Haiku: Reintroduce original BeOS code
@@ -2450,40 +2450,17 @@ index 0000000..2b0493f
+
+#endif
--
2.10.2
2.23.0
From 89a7684997fa175817a3868487bfa0869b2c55db Mon Sep 17 00:00:00 2001
From f097a7ce41ee80d2c014f510d56b3edf951f0994 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sat, 8 Dec 2012 18:44:38 +0000
Subject: Haiku: Add Haiku build def
diff --git a/make/variant/haiku.defs b/make/variant/haiku.defs
new file mode 100644
index 0000000..c703272
--- /dev/null
+++ b/make/variant/haiku.defs
@@ -0,0 +1,11 @@
+TARGET.dylib.ext = .so
+
+GCC.start = 1
+GCC.end = 1
+GCC.args.dylib = -shared
+GCC.args.pic = 1
+
+GCC.args.g.none = -g0
+GCC.args.g.min = -g1
+GCC.args.g.std = -g2
+GCC.args.g.max = -g3
--
2.10.2
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sat, 8 Dec 2012 22:55:18 +0000
Subject: Haiku: Define SYS_HAIKU and add proper checks
diff --git a/libhb/ports.c b/libhb/ports.c
index c7daa43..2a16ef8 100644
--- a/libhb/ports.c
+++ b/libhb/ports.c
@@ -19,7 +19,7 @@
@@ -2513,7 +2490,7 @@ Subject: Haiku: Define SYS_HAIKU and add proper checks
system_info info;
get_system_info( &info );
cpu_count = info.cpu_count;
@@ -796,7 +796,7 @@ struct hb_thread_s
@@ -803,7 +803,7 @@ struct hb_thread_s
hb_lock_t * lock;
int exited;
@@ -2522,7 +2499,7 @@ Subject: Haiku: Define SYS_HAIKU and add proper checks
thread_id thread;
#elif USE_PTHREAD
pthread_t thread;
@@ -852,7 +852,7 @@ static void attribute_align_thread hb_thread_func( void * _t )
@@ -859,7 +859,7 @@ static void attribute_align_thread hb_thread_func( void * _t )
pthread_setschedparam( pthread_self(), SCHED_OTHER, &param );
#endif
@@ -2531,7 +2508,7 @@ Subject: Haiku: Define SYS_HAIKU and add proper checks
signal( SIGINT, SIG_IGN );
#endif
@@ -887,7 +887,7 @@ hb_thread_t * hb_thread_init( const char * name, void (* function)(void *),
@@ -894,7 +894,7 @@ hb_thread_t * hb_thread_init( const char * name, void (* function)(void *),
t->lock = hb_lock_init();
/* Create and start the thread */
@@ -2540,7 +2517,7 @@ Subject: Haiku: Define SYS_HAIKU and add proper checks
t->thread = spawn_thread( (thread_func) hb_thread_func,
name, priority, t );
resume_thread( t->thread );
@@ -919,7 +919,7 @@ void hb_thread_close( hb_thread_t ** _t )
@@ -926,7 +926,7 @@ void hb_thread_close( hb_thread_t ** _t )
hb_thread_t * t = *_t;
/* Join the thread */
@@ -2549,7 +2526,7 @@ Subject: Haiku: Define SYS_HAIKU and add proper checks
long exit_value;
wait_for_thread( t->thread, &exit_value );
@@ -959,7 +959,7 @@ int hb_thread_has_exited( hb_thread_t * t )
@@ -966,7 +966,7 @@ int hb_thread_has_exited( hb_thread_t * t )
***********************************************************************/
struct hb_lock_s
{
@@ -2558,7 +2535,7 @@ Subject: Haiku: Define SYS_HAIKU and add proper checks
sem_id sem;
#elif USE_PTHREAD
pthread_mutex_t mutex;
@@ -980,7 +980,7 @@ hb_lock_t * hb_lock_init()
@@ -987,7 +987,7 @@ hb_lock_t * hb_lock_init()
{
hb_lock_t * l = calloc( sizeof( hb_lock_t ), 1 );
@@ -2567,7 +2544,7 @@ Subject: Haiku: Define SYS_HAIKU and add proper checks
l->sem = create_sem( 1, "sem" );
#elif USE_PTHREAD
pthread_mutexattr_t mta;
@@ -1007,7 +1007,7 @@ void hb_lock_close( hb_lock_t ** _l )
@@ -1014,7 +1014,7 @@ void hb_lock_close( hb_lock_t ** _l )
{
return;
}
@@ -2576,7 +2553,7 @@ Subject: Haiku: Define SYS_HAIKU and add proper checks
delete_sem( l->sem );
#elif USE_PTHREAD
pthread_mutex_destroy( &l->mutex );
@@ -1021,7 +1021,7 @@ void hb_lock_close( hb_lock_t ** _l )
@@ -1028,7 +1028,7 @@ void hb_lock_close( hb_lock_t ** _l )
void hb_lock( hb_lock_t * l )
{
@@ -2585,7 +2562,7 @@ Subject: Haiku: Define SYS_HAIKU and add proper checks
acquire_sem( l->sem );
#elif USE_PTHREAD
pthread_mutex_lock( &l->mutex );
@@ -1032,7 +1032,7 @@ void hb_lock( hb_lock_t * l )
@@ -1039,7 +1039,7 @@ void hb_lock( hb_lock_t * l )
void hb_unlock( hb_lock_t * l )
{
@@ -2594,7 +2571,7 @@ Subject: Haiku: Define SYS_HAIKU and add proper checks
release_sem( l->sem );
#elif USE_PTHREAD
pthread_mutex_unlock( &l->mutex );
@@ -1046,7 +1046,7 @@ void hb_unlock( hb_lock_t * l )
@@ -1053,7 +1053,7 @@ void hb_unlock( hb_lock_t * l )
***********************************************************************/
struct hb_cond_s
{
@@ -2603,7 +2580,7 @@ Subject: Haiku: Define SYS_HAIKU and add proper checks
int thread;
#elif USE_PTHREAD
pthread_cond_t cond;
@@ -1071,7 +1071,7 @@ hb_cond_t * hb_cond_init()
@@ -1078,7 +1078,7 @@ hb_cond_t * hb_cond_init()
if( c == NULL )
return NULL;
@@ -2612,7 +2589,7 @@ Subject: Haiku: Define SYS_HAIKU and add proper checks
c->thread = -1;
#elif USE_PTHREAD
pthread_cond_init( &c->cond, NULL );
@@ -1090,7 +1090,7 @@ void hb_cond_close( hb_cond_t ** _c )
@@ -1097,7 +1097,7 @@ void hb_cond_close( hb_cond_t ** _c )
{
return;
}
@@ -2621,7 +2598,7 @@ Subject: Haiku: Define SYS_HAIKU and add proper checks
#elif USE_PTHREAD
pthread_cond_destroy( &c->cond );
//#elif defined( SYS_CYGWIN )
@@ -1103,7 +1103,7 @@ void hb_cond_close( hb_cond_t ** _c )
@@ -1110,7 +1110,7 @@ void hb_cond_close( hb_cond_t ** _c )
void hb_cond_wait( hb_cond_t * c, hb_lock_t * lock )
{
@@ -2630,7 +2607,7 @@ Subject: Haiku: Define SYS_HAIKU and add proper checks
c->thread = find_thread( NULL );
release_sem( lock->sem );
suspend_thread( c->thread );
@@ -1133,7 +1133,7 @@ void hb_yield(void)
@@ -1140,7 +1140,7 @@ void hb_yield(void)
void hb_cond_timedwait( hb_cond_t * c, hb_lock_t * lock, int msec )
{
@@ -2639,7 +2616,7 @@ Subject: Haiku: Define SYS_HAIKU and add proper checks
c->thread = find_thread( NULL );
release_sem( lock->sem );
suspend_thread( c->thread );
@@ -1151,7 +1151,7 @@ void hb_cond_timedwait( hb_cond_t * c, hb_lock_t * lock, int msec )
@@ -1158,7 +1158,7 @@ void hb_cond_timedwait( hb_cond_t * c, hb_lock_t * lock, int msec )
void hb_cond_signal( hb_cond_t * c )
{
@@ -2648,21 +2625,38 @@ Subject: Haiku: Define SYS_HAIKU and add proper checks
while( c->thread != -1 )
{
thread_info info;
diff --git a/make/variant/haiku.defs b/make/variant/haiku.defs
new file mode 100644
index 0000000..c703272
--- /dev/null
+++ b/make/variant/haiku.defs
@@ -0,0 +1,11 @@
+TARGET.dylib.ext = .so
+
+GCC.start = 1
+GCC.end = 1
+GCC.args.dylib = -shared
+GCC.args.pic = 1
+
+GCC.args.g.none = -g0
+GCC.args.g.min = -g1
+GCC.args.g.std = -g2
+GCC.args.g.max = -g3
--
2.10.2
2.23.0
From 7d2560d11378d3fb01afb9ed06700da1c62ce3e1 Mon Sep 17 00:00:00 2001
From 75808e70679a8874c64d7594a7d402a069674d51 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sat, 8 Dec 2012 22:47:30 +0000
Subject: Haiku: Stub out thread broadcast call
diff --git a/libhb/ports.c b/libhb/ports.c
index 80d1565..00678a1 100644
index 2a16ef8..f8a8b15 100644
--- a/libhb/ports.c
+++ b/libhb/ports.c
@@ -1175,7 +1175,9 @@ void hb_cond_signal( hb_cond_t * c )
@@ -1182,7 +1182,9 @@ void hb_cond_signal( hb_cond_t * c )
void hb_cond_broadcast( hb_cond_t * c )
{
@@ -2674,17 +2668,17 @@ index 80d1565..00678a1 100644
#endif
}
--
2.10.2
2.23.0
From 9290a49384f9efd20e16b0eddf78290185c831ef Mon Sep 17 00:00:00 2001
From 8fb5c30db1d771ea08960854f9eb9f0e954bd1e9 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sat, 8 Dec 2012 22:55:18 +0000
Subject: Haiku: Add needed libraries
diff --git a/make/variant/haiku.defs b/make/variant/haiku.defs
index c703272..d61dd38 100644
index c703272..48cb254 100644
--- a/make/variant/haiku.defs
+++ b/make/variant/haiku.defs
@@ -3,6 +3,7 @@ TARGET.dylib.ext = .so
@@ -2696,10 +2690,10 @@ index c703272..d61dd38 100644
GCC.args.g.none = -g0
--
2.10.2
2.23.0
From 433a01f8fac12517845bf77c389c7e1b5142f3d8 Mon Sep 17 00:00:00 2001
From eded7f665ac3efc5c3412fbb216b2b60daefa7ec Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sun, 9 Dec 2012 05:27:37 +0000
Subject: Haiku: Fix Haiku GUI. Add TODO items
@@ -3144,10 +3138,10 @@ index 0000000..871eb02
+## include the makefile-engine
+include $(BUILDHOME)/etc/makefile-engine
--
2.10.2
2.23.0
From 8e612d401bbdbd961d309abb7acb5d26943a8098 Mon Sep 17 00:00:00 2001
From e785aa3aec5a43420f0571f295fa6acb32ab7063 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sat, 15 Dec 2012 02:45:49 +0000
Subject: Haiku: Fix call to hb_scan
@@ -3178,10 +3172,10 @@ index 44e39a1..8833e29 100644
}
}
--
2.10.2
2.23.0
From 365e19b71227daa90dda3d02a2ce1ade0898ed94 Mon Sep 17 00:00:00 2001
From 112efec8c3a79c85385f0b9bc318b966fff3a5a5 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Tue, 12 Jan 2016 22:23:19 +0300
Subject: Haiku: link libs dynamically
@@ -3223,10 +3217,10 @@ index 871eb02..44da58a 100644
# specify additional paths to directories following the standard
--
2.10.2
2.23.0
From b7b683818a10bb4e9155ee38d75e7bbcfe21a757 Mon Sep 17 00:00:00 2001
From e302923c3c295d378d8cbc0efce9227625472edc Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Tue, 12 Jan 2016 22:24:48 +0300
Subject: Haiku: fix defines (untested)
@@ -3278,7 +3272,89 @@ index 7d1049a..d536a18 100644
fVidEncoderPopUp->FindMarked() ) > 0 )
{
--
2.10.2
2.23.0
From 22e1c9b521ad116e0912b6eab749cfadaf3d57de Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Tue, 22 Oct 2019 13:16:07 +0300
Subject: Specify libxml2 heades path on Haiku
diff --git a/libhb/module.defs b/libhb/module.defs
index e052df9..ff23845 100644
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -53,6 +53,8 @@ ifeq ($(BUILD.system),freebsd)
LIBHB.GCC.I += $(LOCALBASE)/include/libxml2
else ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
LIBHB.GCC.I += $(CONTRIB.build/)include/libxml2
+else ifneq (,$(filter $(BUILD.system),haiku))
+ LIBHB.GCC.I += /system/develop/headers/libxml2
else
LIBHB.GCC.I += /usr/include/libxml2
endif
--
2.23.0
From 6982b35bbce14e9ae9e30e6a68524f73d7bf1c72 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Tue, 22 Oct 2019 13:16:43 +0300
Subject: Disable nvenc on Haiku
diff --git a/make/configure.py b/make/configure.py
index c8bc712..94c0541 100644
--- a/make/configure.py
+++ b/make/configure.py
@@ -1327,7 +1327,7 @@ def createCLI():
grp.add_option( '--disable-ffmpeg-aac', dest="enable_ffmpeg_aac", action='store_false' )
h = IfHost( 'enable Nvidia NVEnc video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
- grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=not (host.match( '*-*-darwin*' ) or host.match( '*-*-freebsd*' )), action='store_true', help=h )
+ grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=not (host.match( '*-*-darwin*' ) or host.match( '*-*-freebsd*' ) or host.match( '*-*-haiku*' )), action='store_true', help=h )
cli.add_option_group( grp )
--
2.23.0
From 584263f84bf2a19d2feebbed8bc8abf8536da2ea Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Tue, 22 Oct 2019 13:17:03 +0300
Subject: Remove libsamplerate
diff --git a/libhb/module.defs b/libhb/module.defs
index ff23845..5c88fea 100644
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -118,7 +118,7 @@ LIBHB.dll = $(LIBHB.build/)hb.dll
LIBHB.lib = $(LIBHB.build/)hb.lib
LIBHB.dll.libs = $(foreach n, \
- ass avformat avfilter avcodec avutil swresample postproc dvdnav dvdread \
+ ass avformat avfilter avcodec avutil swresample dvdnav dvdread \
freetype mp3lame samplerate swscale vpx theora vorbis vorbisenc ogg \
x264 xml2 bluray jansson harfbuzz opus speex, \
$(CONTRIB.build/)lib/lib$(n).a )
diff --git a/test/module.defs b/test/module.defs
index 92ae40c..29db26a 100644
--- a/test/module.defs
+++ b/test/module.defs
@@ -14,7 +14,7 @@ TEST.GCC.L = $(CONTRIB.build/)lib
TEST.libs = $(LIBHB.a)
TEST.GCC.l = \
- ass avformat avfilter avcodec avutil swresample postproc mp3lame dvdnav \
+ ass avformat avfilter avcodec avutil swresample mp3lame dvdnav \
dvdread fribidi \
samplerate swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma
--
2.23.0
From 11b6f076e7bf482f47efd00dfd69b413d8047d1a Mon Sep 17 00:00:00 2001
@@ -3286,8 +3362,6 @@ From: Markus Himmel <markus@himmel-villmar.de>
Date: Thu, 21 Jan 2016 16:17:17 +0100
Subject: Fix build of the BeOS GUI
This does not actually make it work properly (though it fixes a small number
of issues). See https://github.com/haikuports/haikuports/issues/411.
diff --git a/haiku/HBApp.cpp b/haiku/HBApp.cpp
index f878308..cfd7345 100644
@@ -3752,88 +3826,5 @@ index 44da58a..0000000
-## include the makefile-engine
-include $(BUILDHOME)/etc/makefile-engine
--
2.10.2
2.23.0
From: Ken Mays <kmays2000@gmail.com>
Date: Thu Aug 16 00:25:51 GMT 2018
Subject: update libhb/module.defs
--- a/libhb/module.defs 2018-08-15 23:19:17.998768640 +0000
+++ b/libhb/module.defs 2018-08-15 23:58:17.119799808 +0000
@@ -52,6 +52,8 @@
LIBHB.GCC.I += /usr/local/include/libxml2
else ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
LIBHB.GCC.I += $(CONTRIB.build/)include/libxml2
+else ifeq ($(BUILD.system),haiku)
+ LIBHB.GCC.I += /system/develop/headers/libxml2
else
LIBHB.GCC.I += /usr/include/libxml2
endif
--
2.10.2
From: Ken Mays <kmays2000@gmail.com>
Date: Thu Aug 16 00:25:51 GMT 2018
Subject: update config.guess
--- a/make/config.guess 2018-06-18 14:07:09.065273856 +0000
+++ b/make/config.guess 2018-08-15 23:19:17.948699136 +0000
@@ -154,6 +154,27 @@
;;
esac
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+ # If the system lacks a compiler, then just pick glibc.
+ # We could probably try harder.
+ LIBC=gnu
+
+ eval $set_cc_for_build
+ cat <<-EOF > $dummy.c
+ #include <features.h>
+ #if defined(__UCLIBC__)
+ LIBC=uclibc
+ #elif defined(__dietlibc__)
+ LIBC=dietlibc
+ #else
+ LIBC=gnu
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ ;;
+esac
+
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -237,6 +258,10 @@
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
exit ;;
+ *:Bitrig:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+ exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -847,6 +872,9 @@
*:MINGW64*:*)
echo ${UNAME_MACHINE}-pc-mingw64
exit ;;
+ *:MINGW64*:*)
+ echo ${UNAME_MACHINE}-pc-mingw64
+ exit ;;
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
@@ -1246,6 +1274,9 @@
exit ;;
x86_64:Haiku:*:*)
echo x86_64-unknown-haiku
+ exit ;;
+ x86_64:Haiku:*:*)
+ echo x86_64-unknown-haiku
exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}