From 6b2a9c4b1d6fe7d225b5475eefad5f9f4056e04a Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 15 Oct 2015 20:30:46 +0000 Subject: [PATCH] x264: update snapshot. * remove upstreamed patch. --- .../x264/patches/x264-20150725.patchset | 47 ------------------- ...4-20150725.recipe => x264-20151014.recipe} | 8 ++-- 2 files changed, 4 insertions(+), 51 deletions(-) delete mode 100644 media-libs/x264/patches/x264-20150725.patchset rename media-libs/x264/{x264-20150725.recipe => x264-20151014.recipe} (86%) diff --git a/media-libs/x264/patches/x264-20150725.patchset b/media-libs/x264/patches/x264-20150725.patchset deleted file mode 100644 index cdb36ca93..000000000 --- a/media-libs/x264/patches/x264-20150725.patchset +++ /dev/null @@ -1,47 +0,0 @@ -From 15849a53c78b5b0d8d10e439ae6d383d62b61e3b Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Fri, 13 Jun 2014 19:56:27 +0000 -Subject: Haiku patch - - -diff --git a/configure b/configure -index 15b1c91..181c64f 100755 ---- a/configure -+++ b/configure -@@ -644,6 +644,9 @@ case $host_os in - HAVE_GETOPT_LONG=0 - CFLAGS="$CFLAGS -I\$(SRCPATH)/extras" - ;; -+ *haiku*) -+ SYS="HAIKU" -+ ;; - *) - die "Unknown system $host, edit the configure" - ;; --- -1.8.3.4 - - -From 50cfef611e7b77ee30f9ec8f04d75a37e430923a Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Wed, 12 Aug 2015 19:46:55 +0000 -Subject: Add Haiku version of adjusting thread priority - - -diff --git a/common/osdep.h b/common/osdep.h -index 2dfd00b..d0819ac 100644 ---- a/common/osdep.h -+++ b/common/osdep.h -@@ -363,6 +363,9 @@ static ALWAYS_INLINE void x264_prefetch( void *p ) - sp.sched_priority -= p;\ - pthread_setschedparam( handle, policy, &sp );\ - } -+#elif SYS_HAIKU -+#include -+#define x264_lower_thread_priority(p) { UNUSED status_t nice_ret = set_thread_priority(find_thread(NULL), B_LOW_PRIORITY); } - #else - #include - #define x264_lower_thread_priority(p) { UNUSED int nice_ret = nice(p); } --- -1.8.3.4 - diff --git a/media-libs/x264/x264-20150725.recipe b/media-libs/x264/x264-20151014.recipe similarity index 86% rename from media-libs/x264/x264-20150725.recipe rename to media-libs/x264/x264-20151014.recipe index 189448f67..269baf146 100644 --- a/media-libs/x264/x264-20150725.recipe +++ b/media-libs/x264/x264-20151014.recipe @@ -4,10 +4,10 @@ HOMEPAGE="http://www.videolan.org/developers/x264.html" COPYRIGHT="2003-2012 VideoLan.org" LICENSE="GNU GPL v2" REVISION="1" -SOURCE_URI="http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20150725-2245.tar.bz2" -SOURCE_DIR="x264-snapshot-20150725-2245" -CHECKSUM_SHA256="c10db04ae93ec4999dde135bafcdbd05fc40ef3187804498734115e521288e0c" -PATCHES="x264-$portVersion.patchset" +SOURCE_URI="http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$portVersion-2245.tar.bz2" +SOURCE_DIR="x264-snapshot-$portVersion-2245" +CHECKSUM_SHA256="41e8f70e87c92e670ffbe816db828fe96fae6c65981ce0b567990a9856e39f4f" +#PATCHES="x264-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86"