diff options
author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2003-03-06 04:43:00 +0000 |
---|---|---|
committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2003-03-06 04:43:00 +0000 |
commit | 4ffec4deab1b9720dd1e8f0c91554860b3be4322 (patch) | |
tree | 746b6391432270cb462220c4f1b0fa7d1ec1b41d /multimedia/libdvdread | |
parent | Fix package build by not filtering shlib names. (diff) |
Update to 0.9.4
Notes
Notes:
svn path=/head/; revision=77014
Diffstat (limited to 'multimedia/libdvdread')
-rw-r--r-- | multimedia/libdvdread/Makefile | 2 | ||||
-rw-r--r-- | multimedia/libdvdread/distinfo | 2 | ||||
-rw-r--r-- | multimedia/libdvdread/files/patch-dvdread::bswap.h | 35 | ||||
-rw-r--r-- | multimedia/libdvdread/files/patch-ndebug | 35 | ||||
-rw-r--r-- | multimedia/libdvdread/pkg-plist | 2 |
5 files changed, 13 insertions, 63 deletions
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile index d6df4c4857fe..1dade657a881 100644 --- a/multimedia/libdvdread/Makefile +++ b/multimedia/libdvdread/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libdvdread -PORTVERSION= 0.9.3 +PORTVERSION= 0.9.4 CATEGORIES= multimedia MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/ diff --git a/multimedia/libdvdread/distinfo b/multimedia/libdvdread/distinfo index dc0371e87a3a..327fa5c07a1c 100644 --- a/multimedia/libdvdread/distinfo +++ b/multimedia/libdvdread/distinfo @@ -1 +1 @@ -MD5 (libdvdread-0.9.3.tar.gz) = 761db1225098c0834485396d9285e5ff +MD5 (libdvdread-0.9.4.tar.gz) = 06353d7b14541ff8b431e69ad404db84 diff --git a/multimedia/libdvdread/files/patch-dvdread::bswap.h b/multimedia/libdvdread/files/patch-dvdread::bswap.h index ad7f78b04ea8..4bb3524c93dc 100644 --- a/multimedia/libdvdread/files/patch-dvdread::bswap.h +++ b/multimedia/libdvdread/files/patch-dvdread::bswap.h @@ -1,26 +1,11 @@ ---- dvdread/bswap.h.orig Sat Nov 23 18:53:53 2002 -+++ dvdread/bswap.h Sat Nov 23 18:56:21 2002 -@@ -22,6 +22,10 @@ - - #include <config.h> - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif -+ - #if defined(WORDS_BIGENDIAN) - /* All bigendian systems are fine, just ignore the swaps. */ - #define B2N_16(x) (void)(x) -@@ -53,6 +57,20 @@ - * FreeBSD and Solaris don't have <byteswap.h> or any other such - * functionality! - */ -+ -+#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000 -+#include <sys/endian.h> -+#define B2N_16(x) x = (be16toh(x)) -+#define B2N_32(x) x = (be32toh(x)) -+#define B2N_64(x) \ +--- dvdread/bswap.h.orig Wed Mar 5 23:13:17 2003 ++++ dvdread/bswap.h Wed Mar 5 23:14:24 2003 +@@ -57,7 +57,15 @@ + #include <sys/endian.h> + #define B2N_16(x) x = be16toh(x) + #define B2N_32(x) x = be32toh(x) +-#define B2N_64(x) x = be64toh(x) ++#define B2N_64(x) x = \ + x = ((((x) & 0xff00000000000000) >> 56) | \ + (((x) & 0x00ff000000000000) >> 40) | \ + (((x) & 0x0000ff0000000000) >> 24) | \ @@ -30,5 +15,5 @@ + (((x) & 0x000000000000ff00) << 40) | \ + (((x) & 0x00000000000000ff) << 56)) - #elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) - #define B2N_16(x) \ + /* This is a slow but portable implementation, it has multiple evaluation + * problems so beware. diff --git a/multimedia/libdvdread/files/patch-ndebug b/multimedia/libdvdread/files/patch-ndebug deleted file mode 100644 index 2383f9ccb31b..000000000000 --- a/multimedia/libdvdread/files/patch-ndebug +++ /dev/null @@ -1,35 +0,0 @@ ---- dvdread/nav_read.c.orig Sun Apr 7 14:51:39 2002 -+++ dvdread/nav_read.c Tue Nov 5 11:47:57 2002 -@@ -27,7 +27,7 @@ - #include "nav_read.h" - - void navRead_PCI(pci_t *pci, unsigned char *buffer) { -- int i, j, k; -+ int i, j; - - assert(sizeof(pci_t) == PCI_BYTES - 1); // -1 for substream id - -@@ -71,6 +71,7 @@ - #endif - - -+#ifndef NDEBUG /* { */ - /* Asserts */ - - /* pci pci gi */ -@@ -112,6 +113,7 @@ - assert(pci->hli.btnit[n].right <= pci->hli.hl_gi.btn_ns); - //vmcmd_verify(pci->hli.btnit[n].cmd); - } else { -+ int k; - assert(pci->hli.btnit[n].btn_coln == 0); - assert(pci->hli.btnit[n].auto_action_mode == 0); - assert(pci->hli.btnit[n].x_start == 0); -@@ -127,6 +129,7 @@ - } - } - } -+#endif /* !NDEBUG } */ - } - - void navRead_DSI(dsi_t *dsi, unsigned char *buffer) { diff --git a/multimedia/libdvdread/pkg-plist b/multimedia/libdvdread/pkg-plist index 639b8e18ec29..94cb9990c389 100644 --- a/multimedia/libdvdread/pkg-plist +++ b/multimedia/libdvdread/pkg-plist @@ -1,7 +1,7 @@ lib/libdvdread.a lib/libdvdread.la lib/libdvdread.so -lib/libdvdread.so.2 +lib/libdvdread.so.3 include/dvdread/dvd_reader.h include/dvdread/ifo_types.h include/dvdread/ifo_read.h |