From 5d0ac6dfb5b114e3c223f50e284916ffbf258446 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 28 Mar 2015 08:07:53 +0000 Subject: [PATCH] libdvdread: bump version --- ...d-5.0.2.recipe => libdvdread-5.0.3.recipe} | 4 +- .../patches/libdvdread-5.0.2.patchset | 22 ---------- .../patches/libdvdread-5.0.3.patchset | 43 +++++++++++++++++++ 3 files changed, 45 insertions(+), 24 deletions(-) rename media-libs/libdvdread/{libdvdread-5.0.2.recipe => libdvdread-5.0.3.recipe} (93%) delete mode 100644 media-libs/libdvdread/patches/libdvdread-5.0.2.patchset create mode 100644 media-libs/libdvdread/patches/libdvdread-5.0.3.patchset diff --git a/media-libs/libdvdread/libdvdread-5.0.2.recipe b/media-libs/libdvdread/libdvdread-5.0.3.recipe similarity index 93% rename from media-libs/libdvdread/libdvdread-5.0.2.recipe rename to media-libs/libdvdread/libdvdread-5.0.3.recipe index a4ce96920..8dd1e24be 100644 --- a/media-libs/libdvdread/libdvdread-5.0.2.recipe +++ b/media-libs/libdvdread/libdvdread-5.0.3.recipe @@ -11,11 +11,11 @@ COPYRIGHT="1998-1999 Eric Smith 2000-2002 Björn Englund 2000-2003 Håkan Hjort, et al." SRC_URI="http://downloads.videolan.org/pub/videolan/libdvdread/$portVersion/libdvdread-$portVersion.tar.bz2" -CHECKSUM_SHA256="82cbe693f2a3971671e7428790b5498392db32185b8dc8622f7b9cd307d3cfbf" +CHECKSUM_SHA256="321cdf2dbdc83c96572bc583cd27d8c660ddb540ff16672ecb28607d018ed82b" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="libdvdread-$portVersion.patchset" diff --git a/media-libs/libdvdread/patches/libdvdread-5.0.2.patchset b/media-libs/libdvdread/patches/libdvdread-5.0.2.patchset deleted file mode 100644 index 56686134e..000000000 --- a/media-libs/libdvdread/patches/libdvdread-5.0.2.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 2959b2e1cfb098bbff9f32c7de69efb0f04e8df1 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 fdf53dc..9781b98 100644 ---- a/src/bswap.h -+++ b/src/bswap.h -@@ -79,7 +79,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.8.3.4 - diff --git a/media-libs/libdvdread/patches/libdvdread-5.0.3.patchset b/media-libs/libdvdread/patches/libdvdread-5.0.3.patchset new file mode 100644 index 000000000..61309c542 --- /dev/null +++ b/media-libs/libdvdread/patches/libdvdread-5.0.3.patchset @@ -0,0 +1,43 @@ +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 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 +