libdvdread: bump to 6.0.0, add debuginfo, sort BUILD_PREREQUIRES.

Also do not store the README and COPYING files in the devel package but, instead, keep them in the base package.
2026-04-22 19:50:05 +02:00 · 2018-07-07 19:21:26 +00:00
parent 81f93d4876
commit 1c42c9a12a
4 changed files with 125 additions and 101 deletions
--- a/media-libs/libdvdread/libdvdread-4.2.0.recipe
+++ b/media-libs/libdvdread/libdvdread-4.2.0.recipe
@@ -1,79 +0,0 @@
-SUMMARY="A simple foundation for reading DVD video disks"
-DESCRIPTION="
-libdvdread provides a simple foundation for reading DVD video disks. It \
-provides the functionality that is required to access many DVDs. libdvdread \
-parses IFO files, reads NAV-blocks, and performs CSS authentication and \
-descrambling (if an external libdvdcss library is installed).
-"
-HOMEPAGE="http://dvdnav.mplayerhq.hu"
-LICENSE="GNU GPL v2"
-COPYRIGHT="1998-1999 Eric Smith
-	2000-2002 Björn Englund
-	2000-2003 Håkan Hjort, et al."
-SOURCE_URI="http://dvdnav.mplayerhq.hu/releases/libdvdread-4.2.0.tar.bz2"
-CHECKSUM_SHA256="0bea15da842a4b04a482b009d72dcc6d9c9524ccc1bf67e5748319ec5ada8097"
-REVISION="2"
-
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
-
-PATCHES="libdvdread-${portVersion}.patch"
-
-PROVIDES="
-	libdvdread${secondaryArchSuffix} = $portVersion
-	lib:libdvdread
-	cmd:dvdread_config
-	"
-
-REQUIRES="
-	haiku${secondaryArchSuffix}
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}
-	"
-
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:gcc${secondaryArchSuffix}
-	cmd:ld${secondaryArchSuffix}
-	cmd:make
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:aclocal
-	cmd:autoconf
-	"
-
-SOURCE_DIR="libdvdread-${portVersion}"
-
-BUILD()
-{
-	./autogen.sh
-	runConfigure ./configure --enable-shared --enable-static
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	# move headers to the correct location
-	mkdir -p $(dirname $includeDir)
-	mv $prefix/include $includeDir/
-
-	# prepare develop/lib
-	prepareInstalledDevelLibs libdvdread
-	fixPkgconfig
-
-	packageEntries devel \
-		$developDir
-}
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libdvdread${secondaryArchSuffix}_devel = $portVersion
-	devel:libdvdread$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	libdvdread$secondaryArchSuffix == $portVersion base
-	"
--- a/media-libs/libdvdread/libdvdread-6.0.0.recipe
+++ b/media-libs/libdvdread/libdvdread-6.0.0.recipe
@@ -0,0 +1,82 @@
+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://dvdnav.mplayerhq.hu/"
+COPYRIGHT="1998-1999 Eric Smith
+	2000-2002 Björn Englund
+	2000-2003 Håkan Hjort, et al."
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="https://download.videolan.org/pub/videolan/libdvdread/$portVersion/libdvdread-$portVersion.tar.bz2"
+CHECKSUM_SHA256="b33b1953b4860545b75f6efc06e01d9849e2ea4f797652263b0b4af6dd10f935"
+PATCHES="libdvdread-$portVersion.patchset"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+libVersion="4.2.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
+PROVIDES="
+	libdvdread$secondaryArchSuffix = $portVersion
+	lib:libdvdread$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libdvdread${secondaryArchSuffix}_devel = $portVersion
+	devel:libdvdread$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	libdvdread$secondaryArchSuffix == $portVersion base
+	"
+
+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
+	"
+
+defineDebugInfoPackage libdvdread$secondaryArchSuffix \
+	"$libDir"/libdvdread.so.$libVersion
+
+BUILD()
+{
+	autoreconf -fi
+	runConfigure ./configure --enable-shared --enable-static \
+		--disable-maintainer-mode
+	touch ChangeLog
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	rm $libDir/libdvdread.la
+
+	# prepare develop/lib
+	prepareInstalledDevelLibs libdvdread
+	fixPkgconfig
+
+	packageEntries devel \
+		"$docDir"/{AUTHORS,ChangeLog,NEWS,TODO} \
+		$developDir
+}
+
+TEST()
+{
+	make check
+}
--- a/media-libs/libdvdread/patches/libdvdread-4.2.0.patch
+++ b/media-libs/libdvdread/patches/libdvdread-4.2.0.patch
@@ -1,22 +0,0 @@
--- libdvdread-4.2.0/configure.ac	2011-10-07 20:20:59.008912896 +0000
-+++ libdvdread-4.2.0-haiku/configure.ac	2012-04-09 16:22:42.155713536 +0000
-@@ -148,6 +148,8 @@
-   *os2*)
-     LDFLAGS="-no-undefined -Zbin-files $LDFLAGS"
-     ;;
-+  *haiku*)
-+  	;;
-   *)
-     AC_CHECK_LIB(c, dlopen,
-                  DYNAMIC_LD_LIBS="",
--- libdvdread-4.2.0/src/bswap.h	2008-10-09 22:04:24.005242880 +0000
-+++ libdvdread-4.2.0-haiku/src/bswap.h	2012-04-09 16:24:41.829947904 +0000
-@@ -73,7 +73,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))
--- a/media-libs/libdvdread/patches/libdvdread-6.0.0.patchset
+++ b/media-libs/libdvdread/patches/libdvdread-6.0.0.patchset
@@ -0,0 +1,43 @@
+From f92b4ab20df2f2515ac2939718049167595f774d Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+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
+