From 7ac67f5b85d4629438eb1461540a052661004a68 Mon Sep 17 00:00:00 2001 From: Haoyuan Sun Date: Sat, 3 Jan 2015 23:57:06 +0000 Subject: [PATCH 1/8] Added luarocks-2.2.0 recipe file --- dev-lua/luarocks/luarocks-2.2.0.recipe | 46 ++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 dev-lua/luarocks/luarocks-2.2.0.recipe diff --git a/dev-lua/luarocks/luarocks-2.2.0.recipe b/dev-lua/luarocks/luarocks-2.2.0.recipe new file mode 100644 index 000000000..c7ded971c --- /dev/null +++ b/dev-lua/luarocks/luarocks-2.2.0.recipe @@ -0,0 +1,46 @@ +SUMMARY="a deployment and management system for Lua modules." +DESCRIPTION="LuaRocks allows you to install modules as self-contained packages called rocks, which also contain version dependency information." +HOMEPAGE="http://luarocks.org" +SRC_URI="http://luarocks.org/releases/luarocks-2.2.0.tar.gz" +SOURCE_DIR=$portVersionedName +REVISION="2" +CHECKSUM_SHA256="9b1a4ec7b103e2fb90a7ba8589d7e0c8523a3d6d54ac469b0bbc144292b9279c" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +PROVIDES=" + cmd:luarocks = $portVersion + " +REQUIRES=" + haiku + lua + lib:liblua + " +BUILD_REQUIRES=" + lua_devel + devel:liblua + " +BUILD_PREREQUIRES=" + haiku_devel + cmd:lua + cmd:luac + cmd:gcc + cmd:ld + cmd:make + cmd:sed + cmd:wget + cmd:md5sum + " + +BUILD() +{ + echo "PREFIX = $prefix" + ./configure --prefix=$prefix --with-lua=/bin --with-lua-include=/system/develop/headers --with-lua-lib=/system/develop/lib + make build +} +INSTALL() +{ + make install +} + +LICENSE="MIT" +COPYRIGHT="2007-2014 Kepler Project" From 3378a37fcf7dcfe45c5d0dc8e6f8f6a9dd590eab Mon Sep 17 00:00:00 2001 From: Haoyuan Sun Date: Sun, 4 Jan 2015 00:51:52 +0000 Subject: [PATCH 2/8] Removed redundant requires --- dev-lua/luarocks/luarocks-2.2.0.recipe | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dev-lua/luarocks/luarocks-2.2.0.recipe b/dev-lua/luarocks/luarocks-2.2.0.recipe index c7ded971c..41af7eff5 100644 --- a/dev-lua/luarocks/luarocks-2.2.0.recipe +++ b/dev-lua/luarocks/luarocks-2.2.0.recipe @@ -9,20 +9,17 @@ CHECKSUM_SHA256="9b1a4ec7b103e2fb90a7ba8589d7e0c8523a3d6d54ac469b0bbc144292b9279 ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" cmd:luarocks = $portVersion + cmd:luarocks_admin = $portVersion " REQUIRES=" haiku lua - lib:liblua " BUILD_REQUIRES=" lua_devel - devel:liblua " BUILD_PREREQUIRES=" haiku_devel - cmd:lua - cmd:luac cmd:gcc cmd:ld cmd:make @@ -33,7 +30,6 @@ BUILD_PREREQUIRES=" BUILD() { - echo "PREFIX = $prefix" ./configure --prefix=$prefix --with-lua=/bin --with-lua-include=/system/develop/headers --with-lua-lib=/system/develop/lib make build } From 3996f4c8aab6b558e1d3d2bae098b7cb693745aa Mon Sep 17 00:00:00 2001 From: Haoyuan Sun Date: Sun, 4 Jan 2015 04:17:50 +0000 Subject: [PATCH 3/8] Addition of env variables --- dev-lua/luarocks/luarocks-2.2.0.recipe | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dev-lua/luarocks/luarocks-2.2.0.recipe b/dev-lua/luarocks/luarocks-2.2.0.recipe index 41af7eff5..06f16e7ae 100644 --- a/dev-lua/luarocks/luarocks-2.2.0.recipe +++ b/dev-lua/luarocks/luarocks-2.2.0.recipe @@ -1,5 +1,8 @@ SUMMARY="a deployment and management system for Lua modules." -DESCRIPTION="LuaRocks allows you to install modules as self-contained packages called rocks, which also contain version dependency information." +DESCRIPTION=" +LuaRocks allows you to install modules as self-contained packages \ +called rocks, which also contain version dependency information. +" HOMEPAGE="http://luarocks.org" SRC_URI="http://luarocks.org/releases/luarocks-2.2.0.tar.gz" SOURCE_DIR=$portVersionedName @@ -14,12 +17,16 @@ PROVIDES=" REQUIRES=" haiku lua + lib:liblua " BUILD_REQUIRES=" lua_devel + devel:liblua " BUILD_PREREQUIRES=" haiku_devel + cmd:lua + cmd:luac cmd:gcc cmd:ld cmd:make @@ -30,7 +37,7 @@ BUILD_PREREQUIRES=" BUILD() { - ./configure --prefix=$prefix --with-lua=/bin --with-lua-include=/system/develop/headers --with-lua-lib=/system/develop/lib + ./configure --prefix=$prefix --with-lua=$binDir --with-lua-include=$includeDir --with-lua-lib=$libDir make build } INSTALL() From 4cd900b183af13eba7d74db725bc1110228c0734 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Sun, 4 Jan 2015 08:58:53 +0100 Subject: [PATCH 4/8] Fix policy error, small changes in SUMMARY and DESCRIPTION. --- dev-util/app2png/app2png-1.0.0.recipe | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-util/app2png/app2png-1.0.0.recipe b/dev-util/app2png/app2png-1.0.0.recipe index 0000fc138..a55fdbf09 100644 --- a/dev-util/app2png/app2png-1.0.0.recipe +++ b/dev-util/app2png/app2png-1.0.0.recipe @@ -1,8 +1,8 @@ -SUMMARY="Turn legacy BeOS app icons into PNGs." +SUMMARY="Turn legacy BeOS application icons into PNGs" DESCRIPTION="\ -With app2png, you can extract attribute-based icons from BeOS apps and save \ -them into PNG files. These PNG icons can then be used to recreate the icon as \ -a vector, or for use on a site." +With app2png, you can extract attribute-based bitmap icons from BeOS apps and \ +save them into PNG files. These PNG icons can then be used to recreate the \ +icon as a vector, or for use on a website." HOMEPAGE="https://github.com/HaikuArchives/app2png" SRC_URI="git+https://github.com/HaikuArchives/app2png#17c36271a80a822ac0dfec66527e61f21230a412" @@ -14,7 +14,7 @@ ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" app2png = $portVersion - app:app2png = $portVersion + cmd:app2png = $portVersion " REQUIRES=" haiku From b4fdcc7ace5415d2021fc71cfb1ecee835357252 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 4 Jan 2015 19:47:06 +0000 Subject: [PATCH 5/8] coreutils: apply gcc2 patchset only for gcc2. --- sys-apps/coreutils/coreutils-8.22.recipe | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys-apps/coreutils/coreutils-8.22.recipe b/sys-apps/coreutils/coreutils-8.22.recipe index ed3431192..171811315 100644 --- a/sys-apps/coreutils/coreutils-8.22.recipe +++ b/sys-apps/coreutils/coreutils-8.22.recipe @@ -26,8 +26,12 @@ ARCHITECTURES="x86_gcc2 x86 x86_64 arm" PATCHES=" coreutils-$portVersion.patchset - coreutils-$portVersion.gcc2.patchset " +if [ $effectiveTargetArchitecture = x86_gcc2 ]; then + PATCHES+=" + coreutils-$portVersion.gcc2.patchset + " +fi PROVIDES=" coreutils = $portVersion compat >= 8 From dbe32bbea551eddc3ad37c6783bfa22eea7fc22e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 4 Jan 2015 20:40:53 +0000 Subject: [PATCH 6/8] soxr: disable visibility hidden for gcc2. --- media-libs/soxr/soxr-0.1.1.recipe | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/media-libs/soxr/soxr-0.1.1.recipe b/media-libs/soxr/soxr-0.1.1.recipe index e211c4fff..db35739bd 100644 --- a/media-libs/soxr/soxr-0.1.1.recipe +++ b/media-libs/soxr/soxr-0.1.1.recipe @@ -41,13 +41,17 @@ PATCHES="soxr-${portVersion}.patchset" BUILD() { + if [ $effectiveTargetArchitecture = x86_gcc2 ]; then + visibilityArgs="-DVISIBILITY_HIDDEN=OFF" + fi cmake . \ -DCMAKE_INSTALL_PREFIX=$prefix \ -DBUILD_TESTS=OFF \ -DBIN_INSTALL_DIR=$binDir \ -DLIB_INSTALL_DIR=$libDir \ -DINCLUDE_INSTALL_DIR=$includeDir \ - -DDOC_INSTALL_DIR=$docDir + -DDOC_INSTALL_DIR=$docDir \ + $visibilityArgs make $jobArgs } From 9da1fbc6183de1cca420da1d4b1a65d3145e267a Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 4 Jan 2015 22:23:07 +0000 Subject: [PATCH 7/8] libebml & libmatroska: bump version. * switch to autotools. --- dev-libs/libebml/libebml-1.0.0.recipe | 25 ------- ...ebml-1.3.0.recipe => libebml-1.3.1.recipe} | 46 +++++++------ .../libebml/patches/libebml-0.7.8-haiku.diff | 21 ------ dev-libs/libebml/patches/libebml-1.0.0.patch | 67 ------------------- .../libebml/patches/libebml-1.3.1.patchset | 22 ++++++ .../libmatroska/libmatroska-1.0.0.recipe | 25 ------- ...-1.4.1.recipe => libmatroska-1.4.2.recipe} | 48 ++++++------- .../patches/libmatroska-1.0.0.patch | 47 ------------- .../patches/libmatroska-1.4.2.patchset | 22 ++++++ 9 files changed, 94 insertions(+), 229 deletions(-) delete mode 100644 dev-libs/libebml/libebml-1.0.0.recipe rename dev-libs/libebml/{libebml-1.3.0.recipe => libebml-1.3.1.recipe} (53%) delete mode 100644 dev-libs/libebml/patches/libebml-0.7.8-haiku.diff delete mode 100644 dev-libs/libebml/patches/libebml-1.0.0.patch create mode 100644 dev-libs/libebml/patches/libebml-1.3.1.patchset delete mode 100644 media-libs/libmatroska/libmatroska-1.0.0.recipe rename media-libs/libmatroska/{libmatroska-1.4.1.recipe => libmatroska-1.4.2.recipe} (55%) delete mode 100644 media-libs/libmatroska/patches/libmatroska-1.0.0.patch create mode 100644 media-libs/libmatroska/patches/libmatroska-1.4.2.patchset diff --git a/dev-libs/libebml/libebml-1.0.0.recipe b/dev-libs/libebml/libebml-1.0.0.recipe deleted file mode 100644 index 4c79fea0c..000000000 --- a/dev-libs/libebml/libebml-1.0.0.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libebml is a C++ library to parse EBML content (read/write)." -HOMEPAGE="http://www.matroska.org/" -SRC_URI="http://dl.matroska.org/downloads/libebml/libebml-1.0.0.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="6d438f03d8928d83a2d120ed02705f03" -BUILD() -{ - cd libebml-1.0.0/make/linux - make -} - -INSTALL() -{ - cd libebml-1.0.0/make/linux - if [ -n ${DESTDIR} ];then - make install DESTDIR="${DESTDIR}" - else - make install - fi -} - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2005-2009 CoreCodec, Inc." diff --git a/dev-libs/libebml/libebml-1.3.0.recipe b/dev-libs/libebml/libebml-1.3.1.recipe similarity index 53% rename from dev-libs/libebml/libebml-1.3.0.recipe rename to dev-libs/libebml/libebml-1.3.1.recipe index 3957bf4ce..7afdcadcf 100644 --- a/dev-libs/libebml/libebml-1.3.0.recipe +++ b/dev-libs/libebml/libebml-1.3.1.recipe @@ -1,64 +1,68 @@ SUMMARY="libebml is a C++ library to parse EBML content (read/write)." DESCRIPTION="libebml is a C++ library to parse EBML content (read/write)." HOMEPAGE="http://www.matroska.org/" -SRC_URI="http://dl.matroska.org/downloads/libebml/libebml-1.3.0.tar.bz2" -CHECKSUM_SHA256="83b074d6b62715aa0080406ea84d33df2e44b5d874096640233a4db49b8096de" - +SRC_URI="http://dl.matroska.org/downloads/libebml/libebml-1.3.1.tar.bz2" +CHECKSUM_SHA256="195894b31aaca55657c9bc157d744f23b0c25597606b97cfa5a9039c4b684295" REVISION="1" - LICENSE="GNU LGPL v2.1" COPYRIGHT="2005-2013 CoreCodec, Inc." -ARCHITECTURES="x86_gcc2 x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" + PROVIDES=" libebml$secondaryArchSuffix = $portVersion - lib:libebml$secondaryArchSuffix = 4 + lib:libebml$secondaryArchSuffix = 4.0.0 compat >= 4 " REQUIRES=" haiku${secondaryArchSuffix} + lib:libstdc++${secondaryArchSuffix} " +if [ $effectiveTargetArchitecture = x86_gcc2 ]; then + PATCHES=" + libebml-$portVersion.patchset + " +else + REQUIRES+=" + lib:libgcc_s${secondaryArchSuffix} + " +fi + BUILD_REQUIRES=" " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel + cmd:aclocal + cmd:autoconf + cmd:automake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + cmd:libtool cmd:make - cmd:sed " -PATCH() -{ - sed -i 's/^ifeq (BeOS/ifeq (Haiku/g' make/linux/Makefile - sed -i "s,/boot/home/config,$prefix,g" make/linux/Makefile - sed -i "s,^\(libdir\)=\(.*\)$,\1=$libDir,g" make/linux/Makefile - sed -i "s,^\(includedir\)=\(.*\)$,\1=$includeDir/ebml,g" make/linux/Makefile - sed -i 's/-Wextra//g' make/linux/Makefile - sed -i 's/\(#elif defined(__BEOS__)\)/\1 || defined(__HAIKU__)/g' \ - ebml/c/libebml_t.h -} - BUILD() { - cd make/linux + autoreconf -f -i + runConfigure ./configure make $jobArgs } INSTALL() { - cd make/linux make install prepareInstalledDevelLibs libebml + fixPkgconfig packageEntries devel $developDir } PROVIDES_devel=" libebml${secondaryArchSuffix}_devel = $portVersion - devel:libebml$secondaryArchSuffix = 4 + devel:libebml$secondaryArchSuffix = 4.0.0 compat >= 4 " REQUIRES_devel=" libebml$secondaryArchSuffix == $portVersion base diff --git a/dev-libs/libebml/patches/libebml-0.7.8-haiku.diff b/dev-libs/libebml/patches/libebml-0.7.8-haiku.diff deleted file mode 100644 index 8bccf378a..000000000 --- a/dev-libs/libebml/patches/libebml-0.7.8-haiku.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN libebml-0.7.8/ebml/c/libebml_t.h libebml-0.7.8-haiku/ebml/c/libebml_t.h ---- libebml-0.7.8/ebml/c/libebml_t.h 2009-03-01 02:10:48.000000000 +0000 -+++ libebml-0.7.8-haiku/ebml/c/libebml_t.h 2009-03-01 02:06:42.000000000 +0000 -@@ -72,7 +72,7 @@ - typedef uint16_t uint16; - typedef uint8_t uint8; - # endif // __GNUC__ --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - #include - #elif defined(DJGPP) /* SL : DJGPP doesn't support POSIX types ???? */ - typedef signed long long int64; -@@ -98,7 +98,7 @@ - typedef uint32_t uint32; - typedef uint16_t uint16; - typedef uint8_t uint8; --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - # include - #else // anything else (Linux, BSD, ...) - # include diff --git a/dev-libs/libebml/patches/libebml-1.0.0.patch b/dev-libs/libebml/patches/libebml-1.0.0.patch deleted file mode 100644 index 034937173..000000000 --- a/dev-libs/libebml/patches/libebml-1.0.0.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -urN libebml-1.0.0/ebml/c/libebml_t.h libebml-1.0.0-haiku/ebml/c/libebml_t.h ---- libebml-1.0.0/ebml/c/libebml_t.h 2010-03-23 11:58:36.007077888 +0000 -+++ libebml-1.0.0-haiku/ebml/c/libebml_t.h 2010-06-30 15:54:51.796131328 +0000 -@@ -72,7 +72,7 @@ - typedef uint16_t uint16; - typedef uint8_t uint8; - # endif // __GNUC__ --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - #include - #elif defined(DJGPP) /* SL : DJGPP doesn't support POSIX types ???? */ - typedef signed long long int64; -@@ -98,7 +98,7 @@ - typedef uint32_t uint32; - typedef uint16_t uint16; - typedef uint8_t uint8; --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined (__HAIKU__) - # include - #else // anything else (Linux, BSD, ...) - # include -diff -urN libebml-1.0.0/make/linux/Makefile libebml-1.0.0-destdir/make/linux/Makefile ---- libebml-1.0.0/make/linux/Makefile 2010-06-04 08:44:54.060817408 +0000 -+++ libebml-1.0.0-destdir/make/linux/Makefile 2010-09-22 12:58:40.962854912 +0000 -@@ -13,6 +13,9 @@ - # BeOS wants the libs and headers in /boot/home/config - ifeq (BeOS,$(shell uname -s)) - prefix=/boot/home/config -+# Haiku wants the libs and headers in /boot/common -+else ifeq (Haiku,$(shell uname -s)) -+prefix=/boot/common - else - prefix=/usr/local - endif -@@ -122,23 +125,23 @@ - endif - - install_headers: -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir) - for i in $(INCLUDE_DIR)/*.h; do \ -- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \ -+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \ - done -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c - for i in $(INCLUDE_DIR)/c/*.h; do \ -- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \ -+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \ - done - - install_staticlib: $(LIBRARY) -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) -- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) -+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir) - - install_sharedlib: $(LIBRARY_SO) -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) -- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir) -- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) -+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir) -+ ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO) - - - ifneq ($(wildcard .depend),) diff --git a/dev-libs/libebml/patches/libebml-1.3.1.patchset b/dev-libs/libebml/patches/libebml-1.3.1.patchset new file mode 100644 index 000000000..2297479ad --- /dev/null +++ b/dev-libs/libebml/patches/libebml-1.3.1.patchset @@ -0,0 +1,22 @@ +From dfad87a8cda696eba7c4a96ab898705978a0cec0 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sun, 4 Jan 2015 21:37:55 +0000 +Subject: gcc2 fix + + +diff --git a/Makefile.am b/Makefile.am +index 9b10ee8..3e11510 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,7 +3,7 @@ + ACLOCAL_AMFLAGS = -I m4 + + AM_CPPFLAGS = -I${top_srcdir} +-AM_CXXFLAGS = -Wall -Wextra -Wno-unknown-pragmas -Wshadow ++AM_CXXFLAGS = -Wall -Wno-unknown-pragmas -Wshadow + if ENABLE_DEBUG + AM_CPPFLAGS += -DDEBUG + AM_CXXFLAGS += -g +-- +1.8.3.4 + diff --git a/media-libs/libmatroska/libmatroska-1.0.0.recipe b/media-libs/libmatroska/libmatroska-1.0.0.recipe deleted file mode 100644 index 4db5ffdc4..000000000 --- a/media-libs/libmatroska/libmatroska-1.0.0.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libmatroska is a C++ libary to parse Matroska files." -HOMEPAGE="http://www.matroska.org/" -SRC_URI="http://dl.matroska.org/downloads/libmatroska/libmatroska-1.0.0.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libebml >= 1.0.0" -CHECKSUM_MD5="4efcf3945b17a6f0320cf1aaa326a4de" -BUILD() -{ - cd libmatroska-1.0.0/make/linux - make PREFIX=/boot/common -} - -INSTALL() -{ - cd libmatroska-1.0.0/make/linux - if [ -n ${DESTDIR} ];then - make install DESTDIR="${DESTDIR}" - else - make install - fi -} - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2005-2009 CoreCodec, Inc." diff --git a/media-libs/libmatroska/libmatroska-1.4.1.recipe b/media-libs/libmatroska/libmatroska-1.4.2.recipe similarity index 55% rename from media-libs/libmatroska/libmatroska-1.4.1.recipe rename to media-libs/libmatroska/libmatroska-1.4.2.recipe index ed79ef7aa..9e194de10 100644 --- a/media-libs/libmatroska/libmatroska-1.4.1.recipe +++ b/media-libs/libmatroska/libmatroska-1.4.2.recipe @@ -1,67 +1,69 @@ SUMMARY="libmatroska is a C++ libary to parse Matroska files." DESCRIPTION="libmatroska is a C++ libary to parse Matroska files." HOMEPAGE="http://www.matroska.org/" -SRC_URI="http://dl.matroska.org/downloads/libmatroska/libmatroska-1.4.1.tar.bz2" -CHECKSUM_SHA256="086f21873e925679babdabf793c3bb85c353d0cd79423543a3355e08e8a4efb7" - +SRC_URI="http://dl.matroska.org/downloads/libmatroska/libmatroska-$portVersion.tar.bz2" +CHECKSUM_SHA256="bea10320f1f1fd121bbd7db9ffc77b2518e8269f00903549c5425478bbf8393f" REVISION="1" - LICENSE="GNU LGPL v2.1" COPYRIGHT="2005-2013 CoreCodec, Inc." -ARCHITECTURES="x86_gcc2 x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libmatroska$secondaryArchSuffix = $portVersion - lib:libmatroska$secondaryArchSuffix = 6 + lib:libmatroska$secondaryArchSuffix = 6.0.0 compat >= 6 " REQUIRES=" haiku${secondaryArchSuffix} lib:libebml$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix " +if [ $effectiveTargetArchitecture = x86_gcc2 ]; then + PATCHES=" + libmatroska-$portVersion.patchset + " +else + REQUIRES+=" + lib:libgcc_s${secondaryArchSuffix} + " +fi BUILD_REQUIRES=" devel:libebml$secondaryArchSuffix " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel + cmd:aclocal + cmd:autoconf + cmd:automake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + cmd:libtool cmd:make - cmd:sed " -PATCH() -{ - sed -i 's/^ifeq (BeOS/ifeq (Haiku/g' make/linux/Makefile - sed -i "s,/boot/home/config,$prefix,g" make/linux/Makefile - sed -i "s,^\(libdir\)=\(.*\)$,\1=$libDir,g" make/linux/Makefile - sed -i "s,^\(includedir\)=\(.*\)$,\1=$includeDir/matroska,g" \ - make/linux/Makefile - sed -i 's/-Wextra//g' make/linux/Makefile -} - BUILD() { - cd make/linux - make $jobArgs \ - LIBEBML_INCLUDE_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir \ - LIBEBML_LIB_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir + autoreconf -f -i + runConfigure ./configure + make $jobArgs + } INSTALL() { - cd make/linux make install prepareInstalledDevelLibs libmatroska + fixPkgconfig packageEntries devel $developDir } PROVIDES_devel=" libmatroska${secondaryArchSuffix}_devel = $portVersion - devel:libmatroska$secondaryArchSuffix = 6 + devel:libmatroska$secondaryArchSuffix = 6.0.0 compat >= 6 " REQUIRES_devel=" libmatroska$secondaryArchSuffix == $portVersion base diff --git a/media-libs/libmatroska/patches/libmatroska-1.0.0.patch b/media-libs/libmatroska/patches/libmatroska-1.0.0.patch deleted file mode 100644 index 65d5f2861..000000000 --- a/media-libs/libmatroska/patches/libmatroska-1.0.0.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -urN libmatroska-1.0.0/make/linux/Makefile libmatroska-1.0.0-haiku/make/linux/Makefile ---- libmatroska-1.0.0/make/linux/Makefile 2010-06-04 08:46:29.017825792 +0000 -+++ libmatroska-1.0.0-haiku/make/linux/Makefile 2010-09-27 01:57:28.436994048 +0000 -@@ -13,6 +13,10 @@ - # BeOS wants the libs and headers in /boot/home/config - ifeq (BeOS,$(shell uname -s)) - prefix=/boot/home/config -+endif -+# Haiku wants the libs and headers in /boot/common -+ifeq (Haiku,$(shell uname -s)) -+prefix:=$(shell finddir B_COMMON_DIRECTORY) - else - prefix=/usr/local - endif -@@ -153,23 +157,23 @@ - endif - - install_headers: -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir) - for i in $(INCLUDE_DIR)/*.h; do \ -- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \ -+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \ - done -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c - for i in $(INCLUDE_DIR)/c/*.h; do \ -- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \ -+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \ - done - - install_staticlib: $(LIBRARY) -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) -- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) -+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir) - - install_sharedlib: $(LIBRARY_SO) -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) -- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir) -- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) -+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir) -+ ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO) - - ifneq ($(wildcard .depend),) - include .depend diff --git a/media-libs/libmatroska/patches/libmatroska-1.4.2.patchset b/media-libs/libmatroska/patches/libmatroska-1.4.2.patchset new file mode 100644 index 000000000..829b0f7a4 --- /dev/null +++ b/media-libs/libmatroska/patches/libmatroska-1.4.2.patchset @@ -0,0 +1,22 @@ +From caa315a5ba5ff2053d6e6c429c83017fdc13e567 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sun, 4 Jan 2015 21:54:48 +0000 +Subject: gcc2 fix + + +diff --git a/Makefile.am b/Makefile.am +index f3b881d..063a480 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,7 +3,7 @@ + ACLOCAL_AMFLAGS = -I m4 + + AM_CPPFLAGS = -I${top_srcdir} +-AM_CXXFLAGS = -Wall -Wextra -Wno-unknown-pragmas -Wshadow $(EBML_CFLAGS) ++AM_CXXFLAGS = -Wall -Wno-unknown-pragmas -Wshadow $(EBML_CFLAGS) + if ENABLE_DEBUG + AM_CPPFLAGS += -DDEBUG + AM_CXXFLAGS += -g +-- +1.8.3.4 + From c5bd380fcf18fce172416abc0408575a3733e074 Mon Sep 17 00:00:00 2001 From: Markus Himmel Date: Mon, 5 Jan 2015 00:08:18 +0000 Subject: [PATCH 8/8] Add bookmarkconverter recipe --- .../bookmarkconverter-0.4.3.recipe | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe diff --git a/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe b/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe new file mode 100644 index 000000000..23785cc6e --- /dev/null +++ b/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe @@ -0,0 +1,50 @@ +SUMMARY="A tool to convert browser bookmarks" +DESCRIPTION="This tool converts bookmarks between QupZilla and WebPositive. \ +It can also convert WebPositive bookmarks to HTML and Chrome as intermediate \ +formats." + +HOMEPAGE="http://github.com/HaikuArchives/BookmarkConverter" + +gitRevision="9f80b05d0afd07fb732f352b92a3e831077d005a" +SRC_URI="https://github.com/HaikuArchives/BookmarkConverter/archive/$gitRevision.zip" +CHECKSUM_SHA256="fcd74f4f71f9f399b6c5bf824486a898ad99aeef237e674da7c0928d3cafce1e" +SOURCE_DIR="BookmarkConverter-$gitRevision" + +REVISION="1" +LICENSE="MIT" +COPYRIGHT=" + 2015 Markus Himmel + " + +ARCHITECTURES="x86_gcc2 ?x86 ?ppc" + +PROVIDES=" + bookmarkconverter = $portVersion + cmd:bookmarkconverter = $portVersion + " + +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + makefile_engine + " + +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc + " + +BUILD() +{ + mkdir -p bin + make TARGET_DIR=bin +} + +INSTALL() +{ + mkdir -p $binDir + cp bin/bookmarkconverter $binDir/bookmarkconverter +}