Attachment #77125 for bug #111100

View | Details | Raw Unified | Return to bug 111100
Collapse All | Expand All

Lines 6-12 Link Here

(-)Makefile (-22 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= libdvdread	8	PORTNAME= libdvdread
9	PORTVERSION= 0.9.4	9	PORTVERSION= 0.9.7
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= multimedia	11	CATEGORIES= multimedia
12	MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/	12	MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/
Lines 18-24 Link Here
18		18
19	USE_AUTOTOOLS= libtool:15	19	USE_AUTOTOOLS= libtool:15
20	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
21	INSTALLS_SHLIB= yes	21	USE_LDCONFIG= yes
		22
		23	CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
22		24
23	DOC_FILES= AUTHORS COPYING NEWS README TODO	25	DOC_FILES= AUTHORS COPYING NEWS README TODO
24		26
Lines 50-73 Link Here
50	.endif	52	.endif
51		53
52	.include <bsd.port.pre.mk>	54	.include <bsd.port.pre.mk>
53
54	# FreeBSD byteswap optimized routines
55	.if ${ARCH} == "i386"
56	. if (defined(MACHINE_CPU) && ${MACHINE_CPU:Mi486} == "i486")
57	WITH_OPTIMIZED_BYTESWAP=yes
58	. endif
59
60	. if defined(WITH_OPTIMIZED_BYTESWAP)
61	EXTRA_PATCHES= ${FILESDIR}/extra-patch-dvdread::bswap.h
62	. endif
63	.endif
64
65	pre-everything::
66	.ifndef(WITH_OPTIMIZED_BYTESWAP)
67	@${ECHO_MSG} '===>'
68	@${ECHO_MSG} '===> Define WITH_OPTIMIZED_BYTESWAP to use optimized byteswap'
69	@${ECHO_MSG} '===> routines. This works only in the i386 architecture, and'
70	@${ECHO_MSG} '===> only with 486 processors and above.'
71	.endif
72
73	.include <bsd.port.post.mk>	55	.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (libdvdread-0.9.4.tar.gz) = 06353d7b14541ff8b431e69ad404db84	1	MD5 (libdvdread-0.9.7.tar.gz) = 078788c9241ae16763529e1235502337
2	SHA256 (libdvdread-0.9.4.tar.gz) = bb9027e5753ec5daf0206ca9b642cd7a9d4a3b783f1d38162a9d7b8c10742f30	2	SHA256 (libdvdread-0.9.7.tar.gz) = e01f70cba5cfbc577b853ae69d73f00db7161e1704dc2359c4377aac4232a184
3	SIZE (libdvdread-0.9.4.tar.gz) = 256858	3	SIZE (libdvdread-0.9.7.tar.gz) = 389113




lib/libdvdread.a
lib/libdvdread.la
lib/libdvdread.so
lib/libdvdread.so.3
include/dvdread/dvd_reader.h
include/dvdread/ifo_types.h
include/dvdread/ifo_read.h

include/dvdread/nav_types.h
include/dvdread/nav_read.h
include/dvdread/nav_print.h
include/dvdread/cmd_print.h
lib/libdvdread.so.5
lib/libdvdread.so
lib/libdvdread.la
lib/libdvdread.a
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm include/dvdread




--- dvdread/bswap.h.orig	Sat Nov 23 18:53:53 2002
+++ dvdread/bswap.h	Sat Nov 23 18:57:27 2002
@@ -54,6 +54,14 @@
  * functionality! 
  */
 
+#elif defined(__FreeBSD__)
+#  define _KERNEL
+#  define I486_CPU     /* Will crash unless 486+ */
+#  include <machine/endian.h>
+#  undef _KERNEL
+#  undef I486_CPU
+#  define FROM_BE_32(x) (ntohl(x))
+
 #elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__)
 #define B2N_16(x) \
  x = ((((x) & 0xff00) >> 8) | \




--- dvdread/bswap.h.orig	Sat Nov 13 17:18:54 2004
+++ dvdread/bswap.h	Sat Nov 13 18:01:26 2004
@@ -57,7 +57,19 @@
 #include <sys/endian.h>
 #define B2N_16(x) x = be16toh(x)
 #define B2N_32(x) x = be32toh(x)
+# if __FreeBSD_version >= 510000
 #define B2N_64(x) x = be64toh(x)
+# else
+#define B2N_64(x) x = \
+ x = ((((x) & 0xff00000000000000) >> 56) | \
+      (((x) & 0x00ff000000000000) >> 40) | \
+      (((x) & 0x0000ff0000000000) >> 24) | \
+      (((x) & 0x000000ff00000000) >>  8) | \
+      (((x) & 0x00000000ff000000) <<  8) | \
+      (((x) & 0x0000000000ff0000) << 24) | \
+      (((x) & 0x000000000000ff00) << 40) | \
+      (((x) & 0x00000000000000ff) << 56))
+# endif
 
 /* This is a slow but portable implementation, it has multiple evaluation 
  * problems so beware.




--- dvdread/dvd_input.c.orig	Sun Jul 13 14:42:27 2003
+++ dvdread/dvd_input.c	Sun Jul 13 14:42:41 2003
@@ -297,14 +297,7 @@
     
     dvdcss_version = (char **)dlsym(dvdcss_library, U_S "dvdcss_interface_2");
 
-    if(dlsym(dvdcss_library, U_S "dvdcss_crack")) {
-      fprintf(stderr, 
-	      "libdvdread: Old (pre-0.0.2) version of libdvdcss found.\n"
-	      "libdvdread: You should get the latest version from "
-	      "http://www.videolan.org/\n" );
-      dlclose(dvdcss_library);
-      dvdcss_library = NULL;
-    } else if(!DVDcss_open  || !DVDcss_close || !DVDcss_title || !DVDcss_seek
+    if(!DVDcss_open  || !DVDcss_close || !DVDcss_title || !DVDcss_seek
 	      || !DVDcss_read || !DVDcss_error || !dvdcss_version) {
       fprintf(stderr,  "libdvdread: Missing symbols in libdvdcss.so.2, "
 	      "this shouldn't happen !\n");

Return to bug 111100

Lines 1-7 Link Here

(-)pkg-plist (-10 / +11 lines)
1	lib/libdvdread.a
2	lib/libdvdread.la
3	lib/libdvdread.so
4	lib/libdvdread.so.3
5	include/dvdread/dvd_reader.h	1	include/dvdread/dvd_reader.h
6	include/dvdread/ifo_types.h	2	include/dvdread/ifo_types.h
7	include/dvdread/ifo_read.h	3	include/dvdread/ifo_read.h
Lines 9-18 Link Here
9	include/dvdread/nav_types.h	5	include/dvdread/nav_types.h
10	include/dvdread/nav_read.h	6	include/dvdread/nav_read.h
11	include/dvdread/nav_print.h	7	include/dvdread/nav_print.h
12	%%PORTDOCS%%share/doc/libdvdread/AUTHORS	8	include/dvdread/cmd_print.h
13	%%PORTDOCS%%share/doc/libdvdread/COPYING	9	lib/libdvdread.so.5
14	%%PORTDOCS%%share/doc/libdvdread/NEWS	10	lib/libdvdread.so
15	%%PORTDOCS%%share/doc/libdvdread/README	11	lib/libdvdread.la
16	%%PORTDOCS%%share/doc/libdvdread/TODO	12	lib/libdvdread.a
17	%%PORTDOCS%%@dirrm share/doc/libdvdread	13	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
		14	%%PORTDOCS%%%%DOCSDIR%%/COPYING
		15	%%PORTDOCS%%%%DOCSDIR%%/NEWS
		16	%%PORTDOCS%%%%DOCSDIR%%/README
		17	%%PORTDOCS%%%%DOCSDIR%%/TODO
		18	%%PORTDOCS%%@dirrm %%DOCSDIR%%
18	@dirrm include/dvdread	19	@dirrm include/dvdread

Removed Link Here

(-)files/extra-patch-dvdread::bswap.h (-17 lines)
1	--- dvdread/bswap.h.orig Sat Nov 23 18:53:53 2002
2	+++ dvdread/bswap.h Sat Nov 23 18:57:27 2002
3	@@ -54,6 +54,14 @@
4	* functionality!
5	*/
6
7	+#elif defined(__FreeBSD__)
8	+# define _KERNEL
9	+# define I486_CPU /* Will crash unless 486+ */
10	+# include <machine/endian.h>
11	+# undef _KERNEL
12	+# undef I486_CPU
13	+# define FROM_BE_32(x) (ntohl(x))
14	+
15	#elif defined(__FreeBSD__) \|\| defined(__sun) \|\| defined(__bsdi__)
16	#define B2N_16(x) \
17	x = ((((x) & 0xff00) >> 8) \| \

Removed Link Here

(-)files/patch-dvdread::bswap.h (-22 lines)
1	--- dvdread/bswap.h.orig Sat Nov 13 17:18:54 2004
2	+++ dvdread/bswap.h Sat Nov 13 18:01:26 2004
3	@@ -57,7 +57,19 @@
4	#include <sys/endian.h>
5	#define B2N_16(x) x = be16toh(x)
6	#define B2N_32(x) x = be32toh(x)
7	+# if __FreeBSD_version >= 510000
8	#define B2N_64(x) x = be64toh(x)
9	+# else
10	+#define B2N_64(x) x = \
11	+ x = ((((x) & 0xff00000000000000) >> 56) \| \
12	+ (((x) & 0x00ff000000000000) >> 40) \| \
13	+ (((x) & 0x0000ff0000000000) >> 24) \| \
14	+ (((x) & 0x000000ff00000000) >> 8) \| \
15	+ (((x) & 0x00000000ff000000) << 8) \| \
16	+ (((x) & 0x0000000000ff0000) << 24) \| \
17	+ (((x) & 0x000000000000ff00) << 40) \| \
18	+ (((x) & 0x00000000000000ff) << 56))
19	+# endif
20
21	/* This is a slow but portable implementation, it has multiple evaluation
22	* problems so beware.

Removed Link Here

(-)files/patch-dvdread::dvd_input.c (-18 lines)
1	--- dvdread/dvd_input.c.orig Sun Jul 13 14:42:27 2003
2	+++ dvdread/dvd_input.c Sun Jul 13 14:42:41 2003
3	@@ -297,14 +297,7 @@
4
5	dvdcss_version = (char **)dlsym(dvdcss_library, U_S "dvdcss_interface_2");
6
7	- if(dlsym(dvdcss_library, U_S "dvdcss_crack")) {
8	- fprintf(stderr,
9	- "libdvdread: Old (pre-0.0.2) version of libdvdcss found.\n"
10	- "libdvdread: You should get the latest version from "
11	- "http://www.videolan.org/\n" );
12	- dlclose(dvdcss_library);
13	- dvdcss_library = NULL;
14	- } else if(!DVDcss_open \|\| !DVDcss_close \|\| !DVDcss_title \|\| !DVDcss_seek
15	+ if(!DVDcss_open \|\| !DVDcss_close \|\| !DVDcss_title \|\| !DVDcss_seek
16	\|\| !DVDcss_read \|\| !DVDcss_error \|\| !dvdcss_version) {
17	fprintf(stderr, "libdvdread: Missing symbols in libdvdcss.so.2, "
18	"this shouldn't happen !\n");