diff --git a/media-libs/libdvdread/libdvdread-6.1.2.recipe b/media-libs/libdvdread/libdvdread-6.1.3.recipe similarity index 88% rename from media-libs/libdvdread/libdvdread-6.1.2.recipe rename to media-libs/libdvdread/libdvdread-6.1.3.recipe index dc298e319..a7c99983c 100644 --- a/media-libs/libdvdread/libdvdread-6.1.2.recipe +++ b/media-libs/libdvdread/libdvdread-6.1.3.recipe @@ -5,16 +5,20 @@ authentication and descrambling (if an external libdvdcss library is \ installed)." HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html" COPYRIGHT="1998-1999 Eric Smith + 1999 Christian Wolff + 2000-2004 Billy Biggs 2000-2002 Björn Englund - 2000-2003 Håkan Hjort, et al." + 2000-2003 Håkan Hjort + 2002 Samuel Hocevar + 2015 VideoLAN" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://download.videolan.org/pub/videolan/libdvdread/$portVersion/libdvdread-$portVersion.tar.bz2" -CHECKSUM_SHA256="cc190f553758ced7571859e301f802cb4821f164d02bfacfd320c14a4e0da763" +CHECKSUM_SHA256="ce35454997a208cbe50e91232f0e73fb1ac3471965813a13b8730a8f18a15369" PATCHES="libdvdread-$portVersion.patchset" ARCHITECTURES="all" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86" libVersion="8.0.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" diff --git a/media-libs/libdvdread/libdvdread7-6.0.2.recipe b/media-libs/libdvdread/libdvdread7-6.0.2.recipe deleted file mode 100644 index c2861e3b8..000000000 --- a/media-libs/libdvdread/libdvdread7-6.0.2.recipe +++ /dev/null @@ -1,72 +0,0 @@ -SUMMARY="A simple foundation for reading DVD video disks" -DESCRIPTION="libdvdread provides the functionality that is required to \ -access many DVDs. It parses IFO files, reads NAV-blocks, and performs CSS \ -authentication and descrambling (if an external libdvdcss library is \ -installed)." -HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html" -COPYRIGHT="1998-1999 Eric Smith - 2000-2002 Björn Englund - 2000-2003 Håkan Hjort, et al." -LICENSE="GNU GPL v2" -REVISION="2" -SOURCE_URI="https://download.videolan.org/pub/videolan/libdvdread/$portVersion/libdvdread-$portVersion.tar.bz2" -CHECKSUM_SHA256="f91401af213b219cdde24b46c50a57f29301feb7f965678f1d7ed4632cc6feb0" -SOURCE_DIR="libdvdread-$portVersion" -PATCHES="libdvdread-$portVersion.patchset" - -ARCHITECTURES="all" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -libVersion="7.0.0" -libVersionCompat="$libVersion compat >= ${libVersion%%.*}" - -PROVIDES=" - libdvdread7$secondaryArchSuffix = $portVersion - lib:libdvdread$secondaryArchSuffix = $libVersionCompat - " -REQUIRES=" - haiku$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libdvdcss$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoreconf - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - " - -BUILD() -{ - autoreconf -fi - runConfigure ./configure --enable-shared --disable-static \ - --disable-maintainer-mode - touch ChangeLog - make $jobArgs -} - -INSTALL() -{ - make install-strip - - rm $libDir/libdvdread.la - - # prepare develop/lib - prepareInstalledDevelLibs libdvdread - fixPkgconfig - - rm -rf \ - "$docDir"/{AUTHORS,ChangeLog,NEWS,TODO} \ - $developDir -} - -TEST() -{ - make check -} diff --git a/media-libs/libdvdread/patches/libdvdread-6.0.2.patchset b/media-libs/libdvdread/patches/libdvdread-6.0.2.patchset deleted file mode 100644 index 09c3119bc..000000000 --- a/media-libs/libdvdread/patches/libdvdread-6.0.2.patchset +++ /dev/null @@ -1,43 +0,0 @@ -From f92b4ab20df2f2515ac2939718049167595f774d Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Wed, 3 Sep 2014 15:17:33 +0000 -Subject: haiku patch - - -diff --git a/src/bswap.h b/src/bswap.h -index 44c2862..0dd4687 100644 ---- a/src/bswap.h -+++ b/src/bswap.h -@@ -85,7 +85,7 @@ - * functionality! - */ - --#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__OS2__) -+#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__OS2__)|| defined(__HAIKU__) - #define B2N_16(x) \ - x = ((((x) & 0xff00) >> 8) | \ - (((x) & 0x00ff) << 8)) -diff --git a/src/dvd_reader.c b/src/dvd_reader.c -index 4e112d3..f70c5b8 100644 ---- a/src/dvd_reader.c -+++ b/src/dvd_reader.c -@@ -1427,6 +1427,7 @@ int DVDDiscID( dvd_reader_t *dvd, unsigned char *discid ) - for( title = 0; title < title_sets; title++ ) { - dvd_file_t *dvd_file = DVDOpenFile( dvd, title, DVD_READ_INFO_FILE ); - if( dvd_file != NULL ) { -+ char *buffer; - ssize_t bytes_read; - ssize_t file_size = dvd_file->filesize * DVD_VIDEO_LB_LEN; - char *buffer_base = malloc( file_size + 2048 ); -@@ -1438,7 +1439,7 @@ int DVDDiscID( dvd_reader_t *dvd, unsigned char *discid ) - return -1; - } - -- char *buffer = (char *)(((uintptr_t)buffer_base & ~((uintptr_t)2047)) + 2048); -+ buffer = (char *)(((uintptr_t)buffer_base & ~((uintptr_t)2047)) + 2048); - - bytes_read = DVDReadBytes( dvd_file, buffer, file_size ); - if( bytes_read != file_size ) { --- -1.8.3.4 - diff --git a/media-libs/libdvdread/patches/libdvdread-6.1.2.patchset b/media-libs/libdvdread/patches/libdvdread-6.1.3.patchset similarity index 90% rename from media-libs/libdvdread/patches/libdvdread-6.1.2.patchset rename to media-libs/libdvdread/patches/libdvdread-6.1.3.patchset index 38fff47e9..cb8fc5a50 100644 --- a/media-libs/libdvdread/patches/libdvdread-6.1.2.patchset +++ b/media-libs/libdvdread/patches/libdvdread-6.1.3.patchset @@ -1,4 +1,4 @@ -From fb8c59afaab9abe8d4d798c710c587a6d5144f0f Mon Sep 17 00:00:00 2001 +From fd8bdcc61cd86129c35f112350d83e047530c73a Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 3 Sep 2014 15:17:33 +0000 Subject: haiku patch @@ -18,5 +18,5 @@ index d3b2383..2f2358f 100644 x = ((((x) & 0xff00) >> 8) | \ (((x) & 0x00ff) << 8)) -- -2.30.2 +2.37.3