mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 11:40:06 +02:00
libdvdread: bump to 6.0.1 (#3847)
This commit is contained in:
@@ -1,77 +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="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="4"
|
||||
SOURCE_URI="https://download.videolan.org/pub/videolan/libdvdread/libdvdread-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="af9b98f049580a6521d56c978b736d3d609562dd12955e11d50e26d97542dcd4"
|
||||
SOURCE_DIR="libdvdread-${portVersion}"
|
||||
PATCHES="libdvdread-4.2.1.patch"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
|
||||
|
||||
PROVIDES="
|
||||
libdvdread$secondaryArchSuffix = $portVersion
|
||||
cmd:dvdread_config$secondaryArchSuffix
|
||||
lib:libdvdread$secondaryArchSuffix
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
libdvdread${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libdvdread$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES_devel="
|
||||
libdvdread$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtoolize$secondaryArchSuffix
|
||||
cmd:make
|
||||
"
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make check
|
||||
}
|
||||
@@ -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="5"
|
||||
SOURCE_URI="https://download.videolan.org/pub/videolan/libdvdread/$portVersion/libdvdread-$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="321cdf2dbdc83c96572bc583cd27d8c660ddb540ff16672ecb28607d018ed82b"
|
||||
PATCHES="libdvdread-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
|
||||
|
||||
PROVIDES="
|
||||
libdvdread$secondaryArchSuffix = $portVersion
|
||||
lib:libdvdread$secondaryArchSuffix = 4.2.0 compat >= 4
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
libdvdread${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libdvdread$secondaryArchSuffix = 4.2.0 compat >= 4
|
||||
"
|
||||
REQUIRES_devel="
|
||||
libdvdread$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libdvdcss$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:autoreconf
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtoolize$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
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 \
|
||||
$developDir
|
||||
}
|
||||
@@ -8,9 +8,9 @@ COPYRIGHT="1998-1999 Eric Smith
|
||||
2000-2002 Björn Englund
|
||||
2000-2003 Håkan Hjort, et al."
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.videolan.org/pub/videolan/libdvdread/$portVersion/libdvdread-$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="b33b1953b4860545b75f6efc06e01d9849e2ea4f797652263b0b4af6dd10f935"
|
||||
CHECKSUM_SHA256="28ce4f0063883ca4d37dfd40a2f6685503d679bca7d88d58e04ee8112382d5bd"
|
||||
PATCHES="libdvdread-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
@@ -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))
|
||||
@@ -1,43 +0,0 @@
|
||||
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 3da9633..5d065a6 100644
|
||||
--- a/src/dvd_reader.c
|
||||
+++ b/src/dvd_reader.c
|
||||
@@ -1460,6 +1460,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 );
|
||||
@@ -1471,7 +1472,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
|
||||
|
||||
Reference in New Issue
Block a user