diff --git a/dev-libs/libburn/libburn-1.3.8.recipe b/dev-libs/libburn/libburn-1.4.2.pl01.recipe similarity index 54% rename from dev-libs/libburn/libburn-1.3.8.recipe rename to dev-libs/libburn/libburn-1.4.2.pl01.recipe index 72c53d898..e71eabdb9 100644 --- a/dev-libs/libburn/libburn-1.3.8.recipe +++ b/dev-libs/libburn/libburn-1.4.2.pl01.recipe @@ -3,11 +3,12 @@ DESCRIPTION="libburn is a library that can record preformatted data onto CD \ (including Audio CD), DVD and Blu-ray discs (BD) optical media. It also offers \ a facility for reading data blocks from optical media." HOMEPAGE="http://www.libburnia-project.org/" -COPYRIGHT="2006-2014 Mario Danic and Thomas Schmitt" +COPYRIGHT="2006-2016 Mario Danic and Thomas Schmitt" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="http://files.libburnia-project.org/releases/libburn-$portVersion.tar.gz" -CHECKSUM_SHA256="46266bdd4b37ca9700a44bbd8dbfbf3526423ede25751fd2f0211b2b5ce29283" +CHECKSUM_SHA256="33cfcd7f5deb3c6f325ca9eaef36c59b4fcb384bfcddaaa16d9a89da88a80edb" +SOURCE_DIR="libburn-1.4.2" PATCHES="libburn-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -15,7 +16,7 @@ ARCHITECTURES="!x86_gcc2 x86 x86_64" PROVIDES=" libburn$secondaryArchSuffix = $portVersion compat >= 1 cmd:cdrskin$secondaryArchSuffix - lib:libburn$secondaryArchSuffix = 4.91.0 compat >= 4 + lib:libburn$secondaryArchSuffix = 4.95.0 compat >= 4 " REQUIRES=" haiku$secondaryArchSuffix @@ -23,7 +24,7 @@ REQUIRES=" PROVIDES_devel=" libburn${secondaryArchSuffix}_devel = $portVersion compat >= 1 - devel:libburn$secondaryArchSuffix = 4.91.0 compat >= 4 + devel:libburn$secondaryArchSuffix = 4.95.0 compat >= 4 " REQUIRES_devel=" libburn$secondaryArchSuffix == $portVersion base @@ -35,6 +36,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf + cmd:autoreconf cmd:automake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix @@ -43,6 +45,33 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " +PATCH() +{ + sed \ + -e "s,\ +ftp://ftp.berlios.de/pub/cdrecord/alpha,\ +http://sourceforge.net/projects/cdrtools/files/alpha," \ + -e "s,\ +ftp://ftp.berlios.de/pub/cdrecord/,\ +http://sourceforge.net/projects/cdrtools/files/," \ + -e "s,\ +http://cdrecord.berlios.de/private/cdrecord.html,\ +http://cdrtools.sourceforge.net/private/cdrecord.html," \ + -e "s,\ +http://cdrecord.berlios.de/old/private/cdrecord.html,\ +http://cdrtools.sourceforge.net/private/cdrecord.html," \ + -e "s,\ +http://cdrecord.berlios.de/old/private/man/cdrecord-2.0.html,\ +http://cdrtools.sourceforge.net/private/man/cdrecord/cdrecord.1.html," \ + -i \ + cdrskin/wiki_plain.txt \ + cdrskin/cdrskin_eng.html \ + cdrskin/cdrskin.c \ + cdrskin/README \ + doc/mediainfo.txt \ + doc/cdtext.txt +} + BUILD() { autoreconf -fi diff --git a/dev-libs/libburn/patches/libburn-1.3.8.patchset b/dev-libs/libburn/patches/libburn-1.3.8.patchset deleted file mode 100644 index 5651a75aa..000000000 --- a/dev-libs/libburn/patches/libburn-1.3.8.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 3467f167b6b8bfc6d5ade96c1c724614f91c1b85 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 19 Feb 2015 22:30:45 +0000 -Subject: Haiku patch - - -diff --git a/configure.ac b/configure.ac -index d402924..c18efa6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -190,7 +190,7 @@ AC_PROG_INSTALL - - AC_CHECK_HEADERS() - --THREAD_LIBS=-lpthread -+AC_CHECK_LIB(pthread,pthread_self,THREAD_LIBS=-lpthread) - AC_SUBST(THREAD_LIBS) - - TARGET_SHIZZLE --- -1.8.3.4 - diff --git a/dev-libs/libburn/patches/libburn-1.4.2.pl01.patchset b/dev-libs/libburn/patches/libburn-1.4.2.pl01.patchset new file mode 100644 index 000000000..9d3a072f2 --- /dev/null +++ b/dev-libs/libburn/patches/libburn-1.4.2.pl01.patchset @@ -0,0 +1,15 @@ +From: fbrosson +Subject: fix pthread detection in configure.ac for Haiku + +diff -upr libburn-1.4.2/configure.ac libburn-1.4.2-haiku/configure.ac +--- libburn-1.4.2/configure.ac 2016-01-29 11:10:12.000000000 +0000 ++++ libburn-1.4.2-haiku/configure.ac +@@ -192,7 +192,7 @@ AC_PROG_INSTALL + + AC_CHECK_HEADERS() + +-THREAD_LIBS=-lpthread ++AC_CHECK_LIB(pthread,pthread_self,THREAD_LIBS=-lpthread) + AC_SUBST(THREAD_LIBS) + + TARGET_SHIZZLE