From c40c7f837ba8e4c32a6a73ce41f36a5e3207bea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 26 Dec 2013 00:48:47 +0000 Subject: [PATCH 1/4] Agg 2.5 --- x11-libs/agg/agg-2.5.recipe | 66 +++++++++++++++++++++++++++++-------- 1 file changed, 52 insertions(+), 14 deletions(-) diff --git a/x11-libs/agg/agg-2.5.recipe b/x11-libs/agg/agg-2.5.recipe index e5d686489..a84cb6e4f 100644 --- a/x11-libs/agg/agg-2.5.recipe +++ b/x11-libs/agg/agg-2.5.recipe @@ -1,27 +1,65 @@ +SUMMARY="Anti-Grain Geometry (AGG)" DESCRIPTION="Anti-Grain Geometry (AGG) is an Open Source, free of charge graphic library, written in industrially standard C++." HOMEPAGE="http://antigrain.com" SRC_URI="http://www.antigrain.com/agg-2.5.tar.gz" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="0229a488bc47be10a2fee6cf0b2febd6" +LICENSE="GNU GPL v2" +COPYRIGHT="2002-2006 Maxim Shemanarev" + +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + lib:libagg = $portVersion +" +REQUIRES=" + haiku >= $haikuVersion + lib:libsdl +" +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + devel:libsdl +" +BUILD_PREREQUIRES=" + cmd:gcc + cmd:make + cmd:autoconf + cmd:automake + cmd:ld + cmd:libtoolize +" + +SOURCE_DIR="agg-2.5" + BUILD() { - cd agg-2.5 - libtoolize --force --copy --install - aclocal - autoheader - autoconf - automake --foreign --add-missing --ignore-deps - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make + #libtoolize --force --copy --install + #aclocal + #autoheader + #autoconf + #automake --foreign --add-missing --ignore-deps + #./configure --prefix=$prefix + #make + cd src + g++ -o libagg.so -shared -fPIC *.cpp ctrl/*.cpp -I../include -lbe -ltranslation } INSTALL() { - cd agg-2.5 - make install DESTDIR=${DESTDIR} + mkdir -p $libDir + mkdir -p $developDir/headers/agg + mkdir -p $developLibDir + + cp src/libagg.so $libDir + cp src/libagg.so $developLibDir + cp -r include/* $developDir/headers/agg/ + packageEntries devel \ + $developDir } +PROVIDES_devel=" + devel:libagg = $portVersion +" +REQUIRES_devel=" + lib:libagg == $portVersion base +" -LICENSE="GNU GPL v2" -COPYRIGHT="2002-2006 Maxim Shemanarev" From c86b0c5ec49904306a7e25f3e9064d10deef8d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 26 Dec 2013 00:50:16 +0000 Subject: [PATCH 2/4] Gnash 0.8.10 --- media-video/gnash/gnash-0.8.10.recipe | 97 +++++++++++++++++++ media-video/gnash/patches/GnashImageGif.patch | 14 +++ media-video/gnash/patches/utility.patch | 13 +++ 3 files changed, 124 insertions(+) create mode 100644 media-video/gnash/gnash-0.8.10.recipe create mode 100644 media-video/gnash/patches/GnashImageGif.patch create mode 100644 media-video/gnash/patches/utility.patch diff --git a/media-video/gnash/gnash-0.8.10.recipe b/media-video/gnash/gnash-0.8.10.recipe new file mode 100644 index 000000000..855f94d9b --- /dev/null +++ b/media-video/gnash/gnash-0.8.10.recipe @@ -0,0 +1,97 @@ +SUMMARY="Gnash" +DESCRIPTION="Gnash" +HOMEPAGE="http://www.gnu.org/software/gnash/" +SRC_URI="ftp://ftp.gnu.org/pub/gnu/gnash/0.8.10/gnash-0.8.10.tar.bz2" +CHECKSUM_MD5="63e9f79c41d93d48c5a2fa94856548c4" +COPYRIGHT="2005-2012 Free Software Foundation" +LICENSE="GNU GPL v3" +REVISION="1" + +DISABLE_SOURCE_PACKAGE=yes + +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86 x86_64" + +PROVIDES=" + gnash$secondaryArchSuffix = $portVersion +" +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libsdl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libgif$secondaryArchSuffix + lib:libavcodec$secondaryArchSuffix + lib:libspeex$secondaryArchSuffix + lib:libexpat$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + boost_thread$secondaryArchSuffix + boost_program_options$secondaryArchSuffix + boost_iostreams$secondaryArchSuffix + boost_serialization$secondaryArchSuffix + boost_date_time$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libsdl_sound$secondaryArchSuffix + lib:libagg$secondaryArchSuffix + #lib:libfreetype$secondaryArchSuffix >= 2.5.0.1 + #lib:libfontconfig$secondaryArchSuffix +" +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsdl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libgif$secondaryArchSuffix + devel:libavcodec$secondaryArchSuffix + devel:libspeex$secondaryArchSuffix + devel:libexpat$secondaryArchSuffix + devel:libcurl$secondaryArchSuffix + boost_devel$secondaryArchSuffix + boost_thread$secondaryArchSuffix + boost_program_options$secondaryArchSuffix + boost_iostreams$secondaryArchSuffix + boost_serialization$secondaryArchSuffix + boost_date_time$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix + devel:libsdl_sound$secondaryArchSuffix + devel:libagg$secondaryArchSuffix + #devel:libfontconfig$secondaryArchSuffix + #devel:libfreetype$secondaryArchSuffix >= 2.5.0.1 +" +BUILD_PREREQUIRES=" + cmd:pkg_config + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make +" + +SOURCE_DIR="gnash-0.8.10" + +PATCHES=" + GnashImageGif.patch + utility.patch +" + +BUILD() +{ + runConfigure ./configure --enable-renderer=agg --enable-media=ffmpeg \ + --enable-gui=sdl --enable-sound=sdl --without-gconf --disable-extensions \ + --with-agg-incl=$portPackageLinksDir/devel~libagg/develop/headers/agg \ + --with-agg-lib=$portPackageLinksDir/lib~libagg/lib/ + make +} +INSTALL() +{ + make install +} +TEST() +{ + make check +} diff --git a/media-video/gnash/patches/GnashImageGif.patch b/media-video/gnash/patches/GnashImageGif.patch new file mode 100644 index 000000000..3d3e502c7 --- /dev/null +++ b/media-video/gnash/patches/GnashImageGif.patch @@ -0,0 +1,14 @@ +diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp +index eeba4b7..bddb452 100644 +--- a/libbase/GnashImageGif.cpp ++++ b/libbase/GnashImageGif.cpp +@@ -269,7 +269,8 @@ GifInput::processRecord(GifRecordType record) + void + GifInput::read() + { +- _gif = DGifOpen(_inStream.get(), &readData); ++ int error_code; ++ _gif = DGifOpen(_inStream.get(), &readData, &error_code); + + GifRecordType record; + diff --git a/media-video/gnash/patches/utility.patch b/media-video/gnash/patches/utility.patch new file mode 100644 index 000000000..865733ee0 --- /dev/null +++ b/media-video/gnash/patches/utility.patch @@ -0,0 +1,13 @@ +diff --git a/libbase/utility.h b/libbase/utility.h +index 8b9f48c..51ea858 100644 +--- a/libbase/utility.h ++++ b/libbase/utility.h +@@ -61,7 +61,7 @@ namespace std + }; + #endif + +-#if defined(__HAIKU__) ++#if defined(__HAIKU_OLD) + namespace std { + class wstring : public std::basic_string + { From 9f8594c2d7c76e28eb9f236aa63fe5f94acad3c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Mon, 30 Dec 2013 15:18:23 +0000 Subject: [PATCH 3/4] Gnash and Agg updated --- media-video/gnash/gnash-0.8.10.recipe | 47 +++++++++++++++++---------- x11-libs/agg/agg-2.5.recipe | 23 ++++++------- 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/media-video/gnash/gnash-0.8.10.recipe b/media-video/gnash/gnash-0.8.10.recipe index 855f94d9b..7e25bb88b 100644 --- a/media-video/gnash/gnash-0.8.10.recipe +++ b/media-video/gnash/gnash-0.8.10.recipe @@ -1,5 +1,5 @@ SUMMARY="Gnash" -DESCRIPTION="Gnash" +DESCRIPTION="Gnash is a player for the Adobe Flash technology" HOMEPAGE="http://www.gnu.org/software/gnash/" SRC_URI="ftp://ftp.gnu.org/pub/gnu/gnash/0.8.10/gnash-0.8.10.tar.bz2" CHECKSUM_MD5="63e9f79c41d93d48c5a2fa94856548c4" @@ -12,6 +12,8 @@ DISABLE_SOURCE_PACKAGE=yes ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" fi SECONDARY_ARCHITECTURES="x86 x86_64" @@ -29,17 +31,18 @@ REQUIRES=" lib:libspeex$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libcurl$secondaryArchSuffix - boost_thread$secondaryArchSuffix - boost_program_options$secondaryArchSuffix - boost_iostreams$secondaryArchSuffix - boost_serialization$secondaryArchSuffix - boost_date_time$secondaryArchSuffix + lib:libboost_thread$secondaryArchSuffix + lib:libboost_program_options$secondaryArchSuffix + lib:libboost_iostreams$secondaryArchSuffix + lib:libboost_serialization$secondaryArchSuffix + lib:libboost_date_time$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libsdl_sound$secondaryArchSuffix lib:libagg$secondaryArchSuffix - #lib:libfreetype$secondaryArchSuffix >= 2.5.0.1 + #lib:libfreetype$secondaryArchSuffix #lib:libfontconfig$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion @@ -53,17 +56,18 @@ BUILD_REQUIRES=" devel:libexpat$secondaryArchSuffix devel:libcurl$secondaryArchSuffix boost_devel$secondaryArchSuffix - boost_thread$secondaryArchSuffix - boost_program_options$secondaryArchSuffix - boost_iostreams$secondaryArchSuffix - boost_serialization$secondaryArchSuffix - boost_date_time$secondaryArchSuffix + devel:libboost_thread$secondaryArchSuffix + devel:libboost_program_options$secondaryArchSuffix + devel:libboost_iostreams$secondaryArchSuffix + devel:libboost_serialization$secondaryArchSuffix + devel:libboost_date_time$secondaryArchSuffix devel:libssl$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix devel:libsdl_sound$secondaryArchSuffix devel:libagg$secondaryArchSuffix #devel:libfontconfig$secondaryArchSuffix - #devel:libfreetype$secondaryArchSuffix >= 2.5.0.1 + #devel:libfreetype$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:pkg_config @@ -80,16 +84,25 @@ PATCHES=" " BUILD() -{ - runConfigure ./configure --enable-renderer=agg --enable-media=ffmpeg \ +{ + INCLUDE_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir + LIB_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir + + export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig" + + ./configure --enable-renderer=agg --enable-media=ffmpeg \ --enable-gui=sdl --enable-sound=sdl --without-gconf --disable-extensions \ - --with-agg-incl=$portPackageLinksDir/devel~libagg/develop/headers/agg \ - --with-agg-lib=$portPackageLinksDir/lib~libagg/lib/ + --with-agg-incl=$INCLUDE_DIR/agg \ + --with-agg-lib=$LIB_DIR + --includedir=$INCLUDE_DIR + --bindir=$appsDir + --libdir=$LIB_DIR make } INSTALL() { make install + addAppDeskbarSymlink $appsDir/Gnash Gnash } TEST() { diff --git a/x11-libs/agg/agg-2.5.recipe b/x11-libs/agg/agg-2.5.recipe index a84cb6e4f..d72f98a07 100644 --- a/x11-libs/agg/agg-2.5.recipe +++ b/x11-libs/agg/agg-2.5.recipe @@ -8,24 +8,25 @@ LICENSE="GNU GPL v2" COPYRIGHT="2002-2006 Maxim Shemanarev" ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - lib:libagg = $portVersion + lib:libagg$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku >= $haikuVersion - lib:libsdl + haiku$secondaryArchSuffix >= $haikuVersion + lib:libsdl$secondaryArchSuffix " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion - devel:libsdl + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsdl$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:gcc + cmd:gcc$secondaryArchSuffix cmd:make cmd:autoconf cmd:automake - cmd:ld + cmd:ld$secondaryArchSuffix cmd:libtoolize " @@ -47,19 +48,19 @@ BUILD() INSTALL() { mkdir -p $libDir - mkdir -p $developDir/headers/agg + mkdir -p $includeDir/agg mkdir -p $developLibDir cp src/libagg.so $libDir cp src/libagg.so $developLibDir - cp -r include/* $developDir/headers/agg/ + cp -r include/* $includeDir/agg/ packageEntries devel \ $developDir } PROVIDES_devel=" - devel:libagg = $portVersion + devel:libagg$secondaryArchSuffix = $portVersion " REQUIRES_devel=" - lib:libagg == $portVersion base + lib:libagg$secondaryArchSuffix == $portVersion base " From ce274fdd923b4c0cfcf7dba09281a3e727039b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Tue, 31 Dec 2013 18:37:31 +0100 Subject: [PATCH 4/4] Gnash marked as broken and agg marked as untested --- media-video/gnash/gnash-0.8.10.recipe | 8 +++----- x11-libs/agg/agg-2.5.recipe | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/media-video/gnash/gnash-0.8.10.recipe b/media-video/gnash/gnash-0.8.10.recipe index 7e25bb88b..5d240f583 100644 --- a/media-video/gnash/gnash-0.8.10.recipe +++ b/media-video/gnash/gnash-0.8.10.recipe @@ -7,15 +7,13 @@ COPYRIGHT="2005-2012 Free Software Foundation" LICENSE="GNU GPL v3" REVISION="1" -DISABLE_SOURCE_PACKAGE=yes - -ARCHITECTURES="x86 x86_64" +ARCHITECTURES="!x86 !x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then - ARCHITECTURES="$ARCHITECTURES x86_gcc2" + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" else ARCHITECTURES="$ARCHITECTURES !x86_gcc2" fi -SECONDARY_ARCHITECTURES="x86 x86_64" +SECONDARY_ARCHITECTURES="!x86 !x86_64" PROVIDES=" gnash$secondaryArchSuffix = $portVersion diff --git a/x11-libs/agg/agg-2.5.recipe b/x11-libs/agg/agg-2.5.recipe index d72f98a07..866e5b574 100644 --- a/x11-libs/agg/agg-2.5.recipe +++ b/x11-libs/agg/agg-2.5.recipe @@ -7,8 +7,8 @@ CHECKSUM_MD5="0229a488bc47be10a2fee6cf0b2febd6" LICENSE="GNU GPL v2" COPYRIGHT="2002-2006 Maxim Shemanarev" -ARCHITECTURES="x86_gcc2 x86" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="?x86_gcc2 ?x86" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" PROVIDES=" lib:libagg$secondaryArchSuffix = $portVersion