Merged haikuports/haikuports into master

media-libs/libiptcdata/libiptcdata-1.0.4.recipe

@@ -0,0 +1,67 @@
+SUMMARY="Library for IPTC metadata manipulation"
+DESCRIPTION="libiptcdata is a library, written in C, for manipulating the International Press Telecommunications Council (IPTC) metadata stored within multimedia files such as images. This metadata can include captions and keywords, often used by popular photo management applications. The library provides routines for parsing, viewing, modifying, and saving this metadata."
+HOMEPAGE="http://libiptcdata.sourceforge.net/"
+COPYRIGHT="
+	2005 David Moore
+	"
+LICENSE="GNU LGPL v2.1"
+SRC_URI="http://prdownloads.sourceforge.net/libiptcdata/libiptcdata-1.0.4.tar.gz?download"
+CHECKSUM_MD5="af886556ecb129b694f2d365d03d95a8"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	libiptcdata = $portVersion
+	cmd:iptc = $portVersion
+	lib:libiptcdata = 0.3.3
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libiconv
+	lib:libintl
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libiconv
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:libtool
+	cmd:autoconf 
+	cmd:automake
+	"
+PATCHES="libiptcdata-1.0.4.patch"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal -I m4
+	autoconf
+	automake
+	runConfigure ./configure --disable-gtk-doc --enable-static --enable-shared
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libiptcdata
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	libiptcdata_devel = $portVersion
+	devel:libiptcdata = 0.3.3
+	"
+REQUIRES_devel="
+	libiptcdata == $portVersion base
+	"

media-video/ffmpeg/ffmpeg-0.10.2.recipe

@@ -11,11 +11,13 @@ COPYRIGHT="
 	"
 SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.2.tar.bz2"
 CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd"
-REVISION="4"
+REVISION="5"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="ffmpeg-0.10.2-gcc2.patch"
+if [ $targetArchitecture == x86_gcc2 ]; then
+	PATCHES="ffmpeg-0.10.2-gcc2.patch"
+fi
 
 PROVIDES="
 	ffmpeg$secondaryArchSuffix = $portVersion compat >= 0.10
@@ -37,6 +39,7 @@ fi
 
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libbz2$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
 	lib:libspeex$secondaryArchSuffix
 	lib:libtheoradec$secondaryArchSuffix
@@ -47,6 +50,7 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
+	devel:libbz2$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
 	devel:libspeex$secondaryArchSuffix
 	devel:libtheora$secondaryArchSuffix