From dd15d6bf5e7b9af68aa5be25d20d310726e88fce Mon Sep 17 00:00:00 2001 From: kenmays Date: Wed, 12 Sep 2018 09:57:15 -0700 Subject: [PATCH] Handbrake 1.1.1 update (#2994) * Create handbrake-1.1.1.recipe * handbrake: add handbrake-1.1.1.patchset * Update handbrake-1.1.1.recipe * Update handbrake-1.1.1.recipe * Update handbrake-1.1.1.recipe * Update handbrake-1.1.1.recipe * Update handbrake-1.1.1.recipe * Delete handbrake-1.0.7.recipe * Delete handbrake-1.0.7.patchset --- ...ke-1.0.7.recipe => handbrake-1.1.1.recipe} | 30 +- ....0.7.patchset => handbrake-1.1.1.patchset} | 558 +++--------------- 2 files changed, 93 insertions(+), 495 deletions(-) rename media-video/handbrake/{handbrake-1.0.7.recipe => handbrake-1.1.1.recipe} (86%) rename media-video/handbrake/patches/{handbrake-1.0.7.patchset => handbrake-1.1.1.patchset} (89%) diff --git a/media-video/handbrake/handbrake-1.0.7.recipe b/media-video/handbrake/handbrake-1.1.1.recipe similarity index 86% rename from media-video/handbrake/handbrake-1.0.7.recipe rename to media-video/handbrake/handbrake-1.1.1.recipe index 620d2be23..18459c0a7 100644 --- a/media-video/handbrake/handbrake-1.0.7.recipe +++ b/media-video/handbrake/handbrake-1.1.1.recipe @@ -5,10 +5,10 @@ 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="3" -SOURCE_URI="http://download.handbrake.fr/releases/$portVersion/HandBrake-$portVersion.tar.bz2" -CHECKSUM_SHA256="ffdee112f0288f0146b965107956cd718408406b75db71c44d2188f5296e677f" +COPYRIGHT="2003-2018 HandBrake Team" +REVISION="1" +SOURCE_URI="http://download.handbrake.fr/releases/$portVersion/HandBrake-$portVersion-source.tar.bz2" +CHECKSUM_SHA256="e3390c5fd901fb06d72e29c62a63d373d5fb5b3467295d114d815ae7b78a9d7a" SOURCE_DIR="HandBrake-$portVersion" PATCHES="handbrake-$portVersion.patchset" ADDITIONAL_FILES="HandBrake.rdef" @@ -19,13 +19,12 @@ SECONDARY_ARCHITECTURES="?x86" PROVIDES=" handbrake$secondaryArchSuffix = $portVersion cmd:HandBrakeCLI -# app:HandBrake " REQUIRES=" haiku$secondaryArchSuffix lib:liba52$secondaryArchSuffix lib:libass$secondaryArchSuffix - lib:libavcodec$secondaryArchSuffix >= 57 + lib:libavcodec$secondaryArchSuffix lib:libbluray$secondaryArchSuffix lib:libbz2$secondaryArchSuffix lib:libdvdnav$secondaryArchSuffix @@ -54,9 +53,9 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:liba52$secondaryArchSuffix - devel:libass$secondaryArchSuffix >= 9 - devel:libavcodec$secondaryArchSuffix >= 57 - devel:libbluray$secondaryArchSuffix >= 2 + devel:libass$secondaryArchSuffix + devel:libavcodec$secondaryArchSuffix + devel:libbluray$secondaryArchSuffix devel:libbz2$secondaryArchSuffix devel:libdvdnav$secondaryArchSuffix devel:libdvdread$secondaryArchSuffix @@ -107,20 +106,12 @@ PATCH() BUILD() { ./configure --prefix=$prefix --force --disable-x265 - cd build - make - cd ../haiku -# make + make $jobArgs } 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`" @@ -129,8 +120,5 @@ INSTALL() -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 } diff --git a/media-video/handbrake/patches/handbrake-1.0.7.patchset b/media-video/handbrake/patches/handbrake-1.1.1.patchset similarity index 89% rename from media-video/handbrake/patches/handbrake-1.0.7.patchset rename to media-video/handbrake/patches/handbrake-1.1.1.patchset index aac187e39..858333d89 100644 --- a/media-video/handbrake/patches/handbrake-1.0.7.patchset +++ b/media-video/handbrake/patches/handbrake-1.1.1.patchset @@ -1,402 +1,3 @@ -From 03f81f8389663870b21a4aa7ba0db94cd540d561 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sat, 4 Oct 2014 15:24:59 +0000 -Subject: update config.guess - - -diff --git a/make/config.guess b/make/config.guess -index d622a44..b79252d 100755 ---- a/make/config.guess -+++ b/make/config.guess -@@ -1,14 +1,12 @@ - #! /bin/sh - # Attempt to guess a canonical system name. --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, --# 2011, 2012 Free Software Foundation, Inc. -+# Copyright 1992-2013 Free Software Foundation, Inc. - --timestamp='2012-02-10' -+timestamp='2013-06-10' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or -+# the Free Software Foundation; either version 3 of the License, or - # (at your option) any later version. - # - # This program is distributed in the hope that it will be useful, but -@@ -22,19 +20,17 @@ timestamp='2012-02-10' - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -- -- --# Originally written by Per Bothner. Please send patches (context --# diff format) to and include a ChangeLog --# entry. -+# the same distribution terms that you use for the rest of that -+# program. This Exception is an additional permission under section 7 -+# of the GNU General Public License, version 3 ("GPLv3"). - # --# This script attempts to guess a canonical system name similar to --# config.sub. If it succeeds, it prints the system name on stdout, and --# exits with 0. Otherwise, it exits with 1. -+# Originally written by Per Bothner. - # - # You can get the latest version of this script from: - # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -+# -+# Please send patches with a ChangeLog entry to config-patches@gnu.org. -+ - - me=`echo "$0" | sed -e 's,.*/,,'` - -@@ -54,9 +50,7 @@ version="\ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, --2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 --Free Software Foundation, Inc. -+Copyright 1992-2013 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown - UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown - UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -+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 -+ #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 -@@ -200,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${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} -@@ -302,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; -- arm:riscos:*:*|arm:RISCOS:*:*) -+ arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) -@@ -801,6 +820,9 @@ EOF - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -+ *:MINGW64*:*) -+ echo ${UNAME_MACHINE}-pc-mingw64 -+ exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; -@@ -852,21 +874,21 @@ EOF - exit ;; - *:GNU:*:*) - # the GNU system -- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` -+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland -- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; - aarch64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - aarch64_be:Linux:*:*) - UNAME_MACHINE=aarch64_be -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -@@ -879,59 +901,54 @@ EOF - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 -- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; -+ arc:Linux:*:* | arceb:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - else - if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_PCS_VFP - then -- echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi - else -- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf - fi - fi - exit ;; - avr32*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - cris:Linux:*:*) -- echo ${UNAME_MACHINE}-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; - crisv32:Linux:*:*) -- echo ${UNAME_MACHINE}-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; - frv:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - hexagon:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - i*86:Linux:*:*) -- LIBC=gnu -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #ifdef __dietlibc__ -- LIBC=dietlibc -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` -- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -+ echo ${UNAME_MACHINE}-pc-linux-${LIBC} - exit ;; - ia64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - m32r*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - m68*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build -@@ -950,54 +967,63 @@ EOF - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` -- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } - ;; -+ or1k:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; - or32:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - padre:Linux:*:*) -- echo sparc-unknown-linux-gnu -+ echo sparc-unknown-linux-${LIBC} - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-gnu -+ echo hppa64-unknown-linux-${LIBC} - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -- PA7*) echo hppa1.1-unknown-linux-gnu ;; -- PA8*) echo hppa2.0-unknown-linux-gnu ;; -- *) echo hppa-unknown-linux-gnu ;; -+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; -+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; -+ *) echo hppa-unknown-linux-${LIBC} ;; - esac - exit ;; - ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-gnu -+ echo powerpc64-unknown-linux-${LIBC} - exit ;; - ppc:Linux:*:*) -- echo powerpc-unknown-linux-gnu -+ echo powerpc-unknown-linux-${LIBC} -+ exit ;; -+ ppc64le:Linux:*:*) -+ echo powerpc64le-unknown-linux-${LIBC} -+ exit ;; -+ ppcle:Linux:*:*) -+ echo powerpcle-unknown-linux-${LIBC} - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) -- echo ${UNAME_MACHINE}-ibm-linux -+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC} - exit ;; - sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - sh*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - tile*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - vax:Linux:*:*) -- echo ${UNAME_MACHINE}-dec-linux-gnu -+ echo ${UNAME_MACHINE}-dec-linux-${LIBC} - exit ;; - x86_64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - xtensa*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. -@@ -1201,6 +1227,9 @@ EOF - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; -+ x86_64:Haiku:*:*) -+ echo x86_64-unknown-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -@@ -1227,19 +1256,21 @@ EOF - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown -- case $UNAME_PROCESSOR in -- i386) -- eval $set_cc_for_build -- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -- grep IS_64BIT_ARCH >/dev/null -- then -- UNAME_PROCESSOR="x86_64" -- fi -- fi ;; -- unknown) UNAME_PROCESSOR=powerpc ;; -- esac -+ eval $set_cc_for_build -+ if test "$UNAME_PROCESSOR" = unknown ; then -+ UNAME_PROCESSOR=powerpc -+ fi -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ case $UNAME_PROCESSOR in -+ i386) UNAME_PROCESSOR=x86_64 ;; -+ powerpc) UNAME_PROCESSOR=powerpc64 ;; -+ esac -+ fi -+ fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) -@@ -1256,7 +1287,7 @@ EOF - NEO-?:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} - exit ;; -- NSE-?:NONSTOP_KERNEL:*:*) -+ NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) -@@ -1330,9 +1361,6 @@ EOF - exit ;; - esac - --#echo '(No uname command or uname output not recognized.)' 1>&2 --#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -- - eval $set_cc_for_build - cat >$dummy.c < -Date: Sat, 4 Oct 2014 17:42:41 +0000 -Subject: define SYS_HAIKU - - -diff --git a/libhb/module.defs b/libhb/module.defs -index 8ea828b..4b23064 100644 ---- a/libhb/module.defs -+++ b/libhb/module.defs -@@ -66,6 +66,8 @@ endif - LIBHB.GCC.args.extra.dylib++ += -Wl,--enable-auto-import -static - else ifeq ($(BUILD.system),solaris) - LIBHB.GCC.D += SYS_SunOS _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64 _POSIX_C_SOURCE=200112L __EXTENSIONS__ -+else ifeq ($(BUILD.system),haiku) -+ LIBHB.GCC.D += SYS_HAIKU - else - LIBHB.platform.D = SYS_UNKNOWN - endif --- -2.10.2 - - From 68995c830c51d62715d82b18e9b1a861e2e3f659 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 4 Oct 2014 17:43:55 +0000 @@ -420,51 +21,6 @@ index b1b478d..cc84090 100644 2.10.2 -From b491af4307ecc393d6c1946ba3b211e88ec9a20c Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sun, 5 Oct 2014 19:11:24 +0000 -Subject: link against libnetwork - - -diff --git a/test/module.defs b/test/module.defs -index 3750d6e..acb899c 100644 ---- a/test/module.defs -+++ b/test/module.defs -@@ -63,6 +63,8 @@ ifneq (,$(filter $(BUILD.release),2.10)) - TEST.GCC.l += iconv - endif - TEST.GCC.D += _POSIX_C_SOURCE=200112L __EXTENSIONS__ -+else ifeq ($(BUILD.system),haiku) -+ TEST.GCC.l += network iconv - else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) - ifeq ($(HAS.dlfcn),1) - TEST.GCC.l += dl --- -2.10.2 - -From 7420d08a225ab61879b4c249f8b1e318b89fef85 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Mon, 6 Mar 2017 15:17:17 +0100 -Subject: fix headers path for libxml2. - - -diff --git a/libhb/module.defs b/libhb/module.defs -index acabd94..72597f8 100644 ---- a/libhb/module.defs -+++ b/libhb/module.defs -@@ -46,6 +46,8 @@ LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB.build/)include - - 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 aec83dfd592f64d29613a45d8a4dbf4652431a79 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Sat, 8 Dec 2012 18:23:16 +0000 @@ -2924,26 +2480,10 @@ index 0000000..c703272 2.10.2 -From a1a118cea72ea76fdd6537b347119b1977f906e7 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV -Date: Sat, 8 Dec 2012 22:21:56 +0000 +Date: Sat, 8 Dec 2012 22:55:18 +0000 Subject: Haiku: Define SYS_HAIKU and add proper checks - -diff --git a/libhb/module.defs b/libhb/module.defs -index 4b23064..acabd94 100644 ---- a/libhb/module.defs -+++ b/libhb/module.defs -@@ -68,6 +68,7 @@ else ifeq ($(BUILD.system),solaris) - LIBHB.GCC.D += SYS_SunOS _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64 _POSIX_C_SOURCE=200112L __EXTENSIONS__ - else ifeq ($(BUILD.system),haiku) - LIBHB.GCC.D += SYS_HAIKU -+ #LIBHB.c += $(wildcard $(LIBHB.src/)platform/haiku/*.c) - else - LIBHB.platform.D = SYS_UNKNOWN - endif -diff --git a/libhb/ports.c b/libhb/ports.c -index afc5c59..80d1565 100644 --- a/libhb/ports.c +++ b/libhb/ports.c @@ -19,7 +19,7 @@ @@ -3108,19 +2648,6 @@ index afc5c59..80d1565 100644 while( c->thread != -1 ) { thread_info info; -diff --git a/test/test.c b/test/test.c -index 2e9c115..30c758c 100644 ---- a/test/test.c -+++ b/test/test.c -@@ -297,7 +297,7 @@ void EventLoop(hb_handle_t *h, hb_dict_t *preset_dict) - } - } - hb_snooze( 200 ); --#elif !defined(SYS_BEOS) -+#elif !defined(SYS_BEOS) && !defined(SYS_HAIKU) - fd_set fds; - struct timeval tv; - int ret; -- 2.10.2 @@ -4227,3 +3754,86 @@ index 44da58a..0000000 -- 2.10.2 +From: Ken Mays +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 +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 ++ #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}