libquicktime: fixed build

This commit is contained in:
Jerome Duval
2014-06-13 16:06:47 +00:00
parent d4beae7da3
commit 3ae39d83f7
2 changed files with 39 additions and 8 deletions

View File

@@ -33,8 +33,8 @@ LICENSE="GNU LGPL v2.1"
SRC_URI="http://sourceforge.net/projects/libquicktime/files/libquicktime/$portVersion/libquicktime-$portVersion.tar.gz" SRC_URI="http://sourceforge.net/projects/libquicktime/files/libquicktime/$portVersion/libquicktime-$portVersion.tar.gz"
CHECKSUM_SHA256="1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368" CHECKSUM_SHA256="1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368"
REVISION="1" REVISION="1"
ARCHITECTURES="?x86_gcc2 x86 ?x86_64" ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="?x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PATCHES="libquicktime-$portVersion.patchset" PATCHES="libquicktime-$portVersion.patchset"
@@ -42,6 +42,19 @@ PROVIDES="
libquicktime$secondaryArchSuffix = $portVersion compat >= 1.2 libquicktime$secondaryArchSuffix = $portVersion compat >= 1.2
lib:libquicktime$secondaryArchSuffix = 0.0.0 compat >= 0 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=" REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion haiku$secondaryArchSuffix >= $haikuVersion
lib:libpng15$secondaryArchSuffix lib:libpng15$secondaryArchSuffix
@@ -53,6 +66,7 @@ REQUIRES="
lib:libfaad$secondaryArchSuffix lib:libfaad$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix lib:libiconv$secondaryArchSuffix
lib:libz$secondaryArchSuffix lib:libz$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
" "
BUILD_REQUIRES=" BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion haiku${secondaryArchSuffix}_devel >= $haikuVersion
@@ -65,6 +79,7 @@ BUILD_REQUIRES="
devel:libfaad$secondaryArchSuffix devel:libfaad$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix devel:libiconv$secondaryArchSuffix
devel:libz$secondaryArchSuffix devel:libz$secondaryArchSuffix
devel:libintl$secondaryArchSuffix
" "
BUILD_PREREQUIRES=" BUILD_PREREQUIRES="
cmd:aclocal cmd:aclocal
@@ -74,17 +89,18 @@ BUILD_PREREQUIRES="
cmd:ld$secondaryArchSuffix cmd:ld$secondaryArchSuffix
cmd:libtoolize cmd:libtoolize
cmd:make cmd:make
cmd:pkg_config cmd:pkg_config${secondaryArchSuffix}
cmd:gettext cmd:gettext
" "
BUILD() BUILD()
{ {
aclocal
libtoolize --force --copy --install libtoolize --force --copy --install
./autogen.sh aclocal -I m4
autoconf
automake
runConfigure ./configure --without-doxygen \ runConfigure ./configure --without-doxygen \
--with-libdv --with-libdv --without-cpuflags
make $jobArgs make $jobArgs
} }

View File

@@ -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 <jerome.duval@gmail.com> From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 12 Jun 2014 17:58:08 +0000 Date: Thu, 12 Jun 2014 17:58:08 +0000
Subject: Haiku patch Subject: Haiku patch
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index da1dabc..4718ef2 100644 index da1dabc..dceea22 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -9,7 +9,7 @@ LQT_VERSION_MICRO=`echo $VERSION | cut -d . -f 3 | cut -d p -f 1` @@ -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 fi
dnl CFLAGS="$CFLAGS" 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 @@ -664,7 +664,7 @@ if test "x$with_faac" != "xno"; then
OLD_CFLAGS=$CFLAGS OLD_CFLAGS=$CFLAGS
OLD_LIBS=$LIBS OLD_LIBS=$LIBS