diff --git a/media-libs/libquicktime/libquicktime-1.2.4.recipe b/media-libs/libquicktime/libquicktime-1.2.4.recipe index a4b72dcfe..8d2bfed39 100644 --- a/media-libs/libquicktime/libquicktime-1.2.4.recipe +++ b/media-libs/libquicktime/libquicktime-1.2.4.recipe @@ -33,8 +33,8 @@ LICENSE="GNU LGPL v2.1" SRC_URI="http://sourceforge.net/projects/libquicktime/files/libquicktime/$portVersion/libquicktime-$portVersion.tar.gz" CHECKSUM_SHA256="1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368" REVISION="1" -ARCHITECTURES="?x86_gcc2 x86 ?x86_64" -SECONDARY_ARCHITECTURES="?x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="libquicktime-$portVersion.patchset" @@ -42,6 +42,19 @@ PROVIDES=" libquicktime$secondaryArchSuffix = $portVersion compat >= 1.2 lib:libquicktime$secondaryArchSuffix = 0.0.0 compat >= 0 " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:lqt_transcode + cmd:lqtremux + cmd:qt2text + cmd:qtdechunk + cmd:qtdump + cmd:qtinfo + cmd:qtrechunk + cmd:qtstreamize + cmd:qtyuv4toyuv + " +fi REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion lib:libpng15$secondaryArchSuffix @@ -53,6 +66,7 @@ REQUIRES=" lib:libfaad$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libz$secondaryArchSuffix + lib:libintl$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion @@ -65,6 +79,7 @@ BUILD_REQUIRES=" devel:libfaad$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libz$secondaryArchSuffix + devel:libintl$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:aclocal @@ -74,17 +89,18 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make - cmd:pkg_config + cmd:pkg_config${secondaryArchSuffix} cmd:gettext " BUILD() { - aclocal libtoolize --force --copy --install - ./autogen.sh + aclocal -I m4 + autoconf + automake runConfigure ./configure --without-doxygen \ - --with-libdv + --with-libdv --without-cpuflags make $jobArgs } diff --git a/media-libs/libquicktime/patches/libquicktime-1.2.4.patchset b/media-libs/libquicktime/patches/libquicktime-1.2.4.patchset index a153a4991..a2dff8faa 100644 --- a/media-libs/libquicktime/patches/libquicktime-1.2.4.patchset +++ b/media-libs/libquicktime/patches/libquicktime-1.2.4.patchset @@ -1,11 +1,11 @@ -From 8d52abdda6bcd2f979d70a27524403812889f2a2 Mon Sep 17 00:00:00 2001 +From 6c572e20694fc0478baaccaef6801a314938d65e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 12 Jun 2014 17:58:08 +0000 Subject: Haiku patch diff --git a/configure.ac b/configure.ac -index da1dabc..4718ef2 100644 +index da1dabc..dceea22 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ LQT_VERSION_MICRO=`echo $VERSION | cut -d . -f 3 | cut -d p -f 1` @@ -29,6 +29,21 @@ index da1dabc..4718ef2 100644 fi dnl CFLAGS="$CFLAGS" +@@ -568,11 +568,11 @@ AVCODEC_BUILD="3412992" + + AC_ARG_WITH([ffmpeg], AS_HELP_STRING([--without-ffmpeg], [Build without ffmpeg library (default: test)])) + +-if test "x$with_ffmpeg" != "xno"; then ++dnl if test "x$with_ffmpeg" != "xno"; then + +-ACL_PATH_AVCODEC($AVCODEC_BUILD , have_libavcodec="true", have_libavcodec="false") ++dnl ACL_PATH_AVCODEC($AVCODEC_BUILD , have_libavcodec="true", have_libavcodec="false") + +-fi ++dnl fi + + AVCODEC_REQUIRED=$AVCODEC_VERSION + @@ -664,7 +664,7 @@ if test "x$with_faac" != "xno"; then OLD_CFLAGS=$CFLAGS OLD_LIBS=$LIBS