Attachment #95099 for bug #133413

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

Lines 5-12 Link Here

(-)Makefile (-5 / +8 lines)
5	# $FreeBSD: ports/sysutils/libcdio/Makefile,v 1.29 2009/11/07 23:58:37 arved Exp $	5	# $FreeBSD: ports/sysutils/libcdio/Makefile,v 1.29 2009/11/07 23:58:37 arved Exp $
6		6
7	PORTNAME= libcdio	7	PORTNAME= libcdio
8	PORTVERSION= 0.78.2	8	PORTVERSION= 0.82
9	PORTREVISION= 3
10	CATEGORIES= sysutils	9	CATEGORIES= sysutils
11	MASTER_SITES= ${MASTER_SITE_GNU}	10	MASTER_SITES= ${MASTER_SITE_GNU}
12	MASTER_SITE_SUBDIR= libcdio	11	MASTER_SITE_SUBDIR= libcdio
Lines 26-31 Link Here
26	--with-libiconv-prefix=${LOCALBASE} \	25	--with-libiconv-prefix=${LOCALBASE} \
27	USE_PERL5_BUILD=yes	26	USE_PERL5_BUILD=yes
28	CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"	27	CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
		28	MAN1= cd-drive.1 cd-info.1 iso-read.1 iso-info.1 cd-read.1
29		29
30	INFO= libcdio	30	INFO= libcdio
31		31
Lines 36-43 Link Here
36	.ifdef(WITH_PARANOIA)	36	.ifdef(WITH_PARANOIA)
37	LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia	37	LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
38	PLIST_SUB+= PARANOIA=""	38	PLIST_SUB+= PARANOIA=""
39	MANLANG= "" ja	39	_MANLANG= "" ja
40	MAN1= cd-paranoia.1	40	_MAN1= cd-paranoia.1
		41	.for lang in ${_MANLANG}
		42	_MANPAGES+= ${_MAN1:S%^%${MAN1PREFIX}/man/${lang}/man1/%}
		43	.endfor
41	.else	44	.else
42	CONFIGURE_ARGS+= --without-cd-paranoia	45	CONFIGURE_ARGS+= --without-cd-paranoia
43	PLIST_SUB+= PARANOIA="@comment "	46	PLIST_SUB+= PARANOIA="@comment "
Lines 46-52 Link Here
46	post-patch:	49	post-patch:
47	.ifdef(WITH_PARANOIA)	50	.ifdef(WITH_PARANOIA)
48	${REINPLACE_CMD} -e 's\|/jp/man1\|/ja/man1\|' \	51	${REINPLACE_CMD} -e 's\|/jp/man1\|/ja/man1\|' \
49	${WRKSRC}/src/cd-paranoia/doc/jp/Makefile.in	52	${WRKSRC}/src/cd-paranoia/doc/ja/Makefile.in
50	.else	53	.else
51	${REINPLACE_CMD} -e 's\|libcdio_paranoia.pc\|\|; s\|libcdio_cdda.pc\|\|' \	54	${REINPLACE_CMD} -e 's\|libcdio_paranoia.pc\|\|; s\|libcdio_cdda.pc\|\|' \
52	${WRKSRC}/Makefile.in	55	${WRKSRC}/Makefile.in

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (libcdio-0.78.2.tar.gz) = a6b73300d1247012a1b1246d935ac0d3	1	MD5 (libcdio-0.82.tar.gz) = 1c29b18e01ab2b966162bc727bf3c360
2	SHA256 (libcdio-0.78.2.tar.gz) = 2792e4133a89b254644ffe526c8eab785e1de3078d3a9c1ec03653247700ebde	2	SHA256 (libcdio-0.82.tar.gz) = 1acb3de8e0927906ade7a34c5853173d3068b87b02dfba80d0bf11e47f0b5d39
3	SIZE (libcdio-0.78.2.tar.gz) = 2024218	3	SIZE (libcdio-0.82.tar.gz) = 2240599

Lines 49-55 Link Here

(-)pkg-plist (-2 / +5 lines)
49	lib/libcdio.a	49	lib/libcdio.a
50	lib/libcdio.la	50	lib/libcdio.la
51	lib/libcdio.so	51	lib/libcdio.so
52	lib/libcdio.so.8	52	lib/libcdio.so.12
53	lib/libcdio++.a	53	lib/libcdio++.a
54	lib/libcdio++.la	54	lib/libcdio++.la
55	lib/libcdio++.so	55	lib/libcdio++.so
Lines 65-71 Link Here
65	lib/libiso9660.a	65	lib/libiso9660.a
66	lib/libiso9660.la	66	lib/libiso9660.la
67	lib/libiso9660.so	67	lib/libiso9660.so
68	lib/libiso9660.so.5	68	lib/libiso9660.so.7
69	lib/libiso9660++.a	69	lib/libiso9660++.a
70	lib/libiso9660++.la	70	lib/libiso9660++.la
71	lib/libiso9660++.so	71	lib/libiso9660++.so
Lines 77-82 Link Here
77	libdata/pkgconfig/libcdio.pc	77	libdata/pkgconfig/libcdio.pc
78	%%PARANOIA%%libdata/pkgconfig/libcdio_cdda.pc	78	%%PARANOIA%%libdata/pkgconfig/libcdio_cdda.pc
79	%%PARANOIA%%libdata/pkgconfig/libcdio_paranoia.pc	79	%%PARANOIA%%libdata/pkgconfig/libcdio_paranoia.pc
		80	libdata/pkgconfig/libudf.pc
		81	libdata/pkgconfig/libcdio++.pc
		82	libdata/pkgconfig/libiso9660++.pc
80	libdata/pkgconfig/libiso9660.pc	83	libdata/pkgconfig/libiso9660.pc
81	@dirrm include/cdio	84	@dirrm include/cdio
82	@dirrm include/cdio++	85	@dirrm include/cdio++





$FreeBSD: ports/sysutils/libcdio/files/patch-lib_driver_FreeBSD_freebsd.c,v 1.1 2008/01/02 13:51:57 mich Exp $

--- lib/driver/FreeBSD/freebsd.c.orig
+++ lib/driver/FreeBSD/freebsd.c
@@ -743,6 +743,27 @@
 #endif /*HAVE_FREEBSD_CDROM*/
 }
 
+/*! Find out if media has changed since the last call.  @param
+  p_user_data the environment of the CD object to be acted upon.
+  @return 1 if media has changed since last call, 0 if not. Error
+  return codes are the same as driver_return_code_t
+   */
+int
+get_media_changed_freebsd (const void *p_user_data)
+{
+#ifdef HAVE_FREEBSD_CDROM
+  const _img_private_t *p_env = p_user_data;
+  if ( p_env->access_mode == _AM_CAM ) {
+    return mmc_get_media_changed( p_env->gen.cdio );
+  }
+  else
+    return DRIVER_OP_UNSUPPORTED;
+#else 
+  return DRIVER_OP_NO_DRIVER;
+#endif /*HAVE_FREEBSD_CDROM*/
+}
+
+
 /*!
   Initialization routine. This is the only thing that doesn't
   get called via a function pointer. In fact *we* are the
@@ -790,6 +811,7 @@
     .get_discmode           = get_discmode_generic,
     .get_drive_cap          = get_drive_cap_freebsd,
     .get_first_track_num    = get_first_track_num_generic,
+    .get_media_changed      = get_media_changed_freebsd,
     .get_mcn                = get_mcn_freebsd,
     .get_num_tracks         = get_num_tracks_generic,
     .get_track_channels     = get_track_channels_generic,





$FreeBSD: ports/sysutils/libcdio/files/patch-lib_driver_FreeBSD_freebsd.h,v 1.1 2008/01/02 13:51:57 mich Exp $

--- lib/driver/FreeBSD/freebsd.h.orig
+++ lib/driver/FreeBSD/freebsd.h
@@ -158,6 +158,8 @@
 				cdio_drive_write_cap_t *p_write_cap,
 				cdio_drive_misc_cap_t  *p_misc_cap);
 
+int get_media_changed_freebsd (const void *p_user_data);
+
 char *get_mcn_freebsd_ioctl (const _img_private_t *p_env);
 
 void free_freebsd_cam (void *obj);





$FreeBSD: ports/sysutils/libcdio/files/patch-src_cd-drive.c,v 1.1 2007/03/12 14:19:39 mich Exp $

--- src/cd-drive.c.orig
+++ src/cd-drive.c
@@ -28,7 +28,7 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#include <getopt.h>
+#include "getopt.h"
 #include <cdio/cdio.h>
 #include <cdio/mmc.h>
 

Return to bug 133413

Removed Link Here

(-)files/patch-lib_driver_FreeBSD_freebsd.c (-41 lines)
1
2	$FreeBSD: ports/sysutils/libcdio/files/patch-lib_driver_FreeBSD_freebsd.c,v 1.1 2008/01/02 13:51:57 mich Exp $
3
4	--- lib/driver/FreeBSD/freebsd.c.orig
5	+++ lib/driver/FreeBSD/freebsd.c
6	@@ -743,6 +743,27 @@
7	#endif /HAVE_FREEBSD_CDROM/
8	}
9
10	+/*! Find out if media has changed since the last call. @param
11	+ p_user_data the environment of the CD object to be acted upon.
12	+ @return 1 if media has changed since last call, 0 if not. Error
13	+ return codes are the same as driver_return_code_t
14	+ */
15	+int
16	+get_media_changed_freebsd (const void *p_user_data)
17	+{
18	+#ifdef HAVE_FREEBSD_CDROM
19	+ const _img_private_t *p_env = p_user_data;
20	+ if ( p_env->access_mode == _AM_CAM ) {
21	+ return mmc_get_media_changed( p_env->gen.cdio );
22	+ }
23	+ else
24	+ return DRIVER_OP_UNSUPPORTED;
25	+#else
26	+ return DRIVER_OP_NO_DRIVER;
27	+#endif /HAVE_FREEBSD_CDROM/
28	+}
29	+
30	+
31	/*!
32	Initialization routine. This is the only thing that doesn't
33	get called via a function pointer. In fact we are the
34	@@ -790,6 +811,7 @@
35	.get_discmode = get_discmode_generic,
36	.get_drive_cap = get_drive_cap_freebsd,
37	.get_first_track_num = get_first_track_num_generic,
38	+ .get_media_changed = get_media_changed_freebsd,
39	.get_mcn = get_mcn_freebsd,
40	.get_num_tracks = get_num_tracks_generic,
41	.get_track_channels = get_track_channels_generic,

Removed Link Here

(-)files/patch-lib_driver_FreeBSD_freebsd.h (-14 lines)
1
2	$FreeBSD: ports/sysutils/libcdio/files/patch-lib_driver_FreeBSD_freebsd.h,v 1.1 2008/01/02 13:51:57 mich Exp $
3
4	--- lib/driver/FreeBSD/freebsd.h.orig
5	+++ lib/driver/FreeBSD/freebsd.h
6	@@ -158,6 +158,8 @@
7	cdio_drive_write_cap_t *p_write_cap,
8	cdio_drive_misc_cap_t *p_misc_cap);
9
10	+int get_media_changed_freebsd (const void *p_user_data);
11	+
12	char get_mcn_freebsd_ioctl (const _img_private_t p_env);
13
14	void free_freebsd_cam (void *obj);

Removed Link Here

(-)files/patch-src_cd-drive.c (-14 lines)
1
2	$FreeBSD: ports/sysutils/libcdio/files/patch-src_cd-drive.c,v 1.1 2007/03/12 14:19:39 mich Exp $
3
4	--- src/cd-drive.c.orig
5	+++ src/cd-drive.c
6	@@ -28,7 +28,7 @@
7	#ifdef HAVE_SYS_TYPES_H
8	#include <sys/types.h>
9	#endif
10	-#include <getopt.h>
11	+#include "getopt.h"
12	#include <cdio/cdio.h>
13	#include <cdio/mmc.h>
14