Date: Sun, 9 Feb 2003 14:20:23 +0100 From: Arjan van Leeuwen <avleeuwen@piwebs.com> To: freebsd-gnome@freebsd.org Subject: Fix: devel/gnomevfs2 doesn't compile if audio/cdparanoia is installed (was: Problem compiling GNOME 2.2) Message-ID: <200302091420.23973.avleeuwen@piwebs.com>
next in thread | raw e-mail | index | archive | help
--Boundary-00=_XWlR+w/r/2FH06O
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Hi,
I just discovered why devel/gnomevfs2 gives an error when compiling on my
system.
If the audio/cdparanoia port is installed, it uses that port. The cdparanoia
library is a bit different on FreeBSD than it is on Linux, and that's why
gnomevfs2 fails to compile.
Included is
1) a patch to make gnomevfs2 compile when cdparanoia is installed (to be put
in the files/ directory of the gnomevfs2 port)
2) a diff to the Makefile so that it registers cdparanoia as a dependency when
it is installed
3) a diff for the pkg-plist so that the extra files that are installed when
cdparanoia is present are registered correctly.
If I should also file a PR for this, please tell me. PS: I'm not on this list.
Best regards,
Arjan
---------- Forwarded Message ----------
Subject: Problem compiling GNOME 2.2
Date: Saturday 08 February 2003 22:48
From: Arjan van Leeuwen <avleeuwen@piwebs.com>
To: freebsd-gnome@FreeBSD.org
I'm trying to compile the GNOME 2.2 metaport on FreeBSD 5.0-RELEASE, but I'm
getting an error when compiling devel/gnomevfs2.
I already tried to upgrade all dependencies of gnomevfs2 with a 'portupgrade
-RNf devel/gnomevfs2', but that didn't help; I'm still getting this error.
It looks like this:
cc -DHAVE_CONFIG_H -I. -I. -I.. -I.. -I.. -pthread -DORBIT2=1
-I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include
-I/usr/local/include/libxml2 -I/usr/local/include
-I/usr/local/include/orbit-2.0 -I/usr/local/include/linc-1.0
-I/usr/X11R6/include/gconf/2 -pthread -I/usr/local/include/glib-2.0
-I/usr/local/lib/glib-2.0/include -D_FILE_OFFSET_BITS=64 -D_BSD_SOURCE
-D_GNU_SOURCE -D_LARGEFILE64_SOURCE -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT
-DG_DISABLE_DEPRECATED -DDATADIR=\"/usr/X11R6/share/gnome\"
-DPREFIX=\"/usr/X11R6\" -DLIBDIR=\"/usr/X11R6/lib\"
-DSYSCONFDIR=\"/usr/X11R6/etc\" -DG_LOG_DOMAIN=\"gnome-vfs-modules\"
-D_THREAD_SAFE -I/usr/local/include -O -pipe -mcpu=pentiumpro -c
cdda-method.c -fPIC -DPIC -o .libs/cdda-method.lo
cdda-method.c: In function `do_get_file_info':
cdda-method.c:626: structure has no member named `cdda_device_name'
cdda-method.c:626: structure has no member named `cdda_device_name'
cdda-method.c: In function `do_open_directory':
cdda-method.c:712: structure has no member named `cdda_device_name'
cdda-method.c:712: structure has no member named `cdda_device_name'
gmake[3]: *** [cdda-method.lo] Error 1
gmake[3]: Leaving directory
`/usr/ports/devel/gnomevfs2/work/gnome-vfs-2.2.0/modules'
gmake[2]: *** [all-recursive] Error 1
gmake[2]: Leaving directory
`/usr/ports/devel/gnomevfs2/work/gnome-vfs-2.2.0/modules'
gmake[1]: *** [all-recursive] Error 1
gmake[1]: Leaving directory `/usr/ports/devel/gnomevfs2/work/gnome-vfs-2.2.0'
gmake: *** [all-recursive-am] Error 2
*** Error code 2
Stop in /usr/ports/devel/gnomevfs2.
Is this a known problem?
Thanks,
Arjan
P.S. Please CC me if you reply, I'm not on this list.
-------------------------------------------------------
--Boundary-00=_XWlR+w/r/2FH06O
Content-Type: text/x-makefile;
charset="iso-8859-1";
name="Makefile.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="Makefile.diff"
--- Makefile.orig Sun Feb 9 13:11:38 2003
+++ Makefile Sun Feb 9 14:10:38 2003
@@ -32,6 +32,19 @@
BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/lib/libcdda_paranoia.so.0)
+WITH_CDPARANOIA= yes
+.endif
+
+.if defined(WITH_CDPARANOIA)
+LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
+PLIST_SUB+= CDPARANOIA=""
+.else
+PLIST_SUB+= CDPARANOIA="@comment "
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
@${FIND} ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \
@@ -39,4 +52,4 @@
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/libgnomevfs/Makefile.in
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--Boundary-00=_XWlR+w/r/2FH06O
Content-Type: text/x-diff;
charset="iso-8859-1";
name="pkg-plist.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="pkg-plist.diff"
--- pkg-plist.orig Sun Feb 9 14:18:27 2003
+++ pkg-plist Sun Feb 9 13:37:32 2003
@@ -3,6 +3,7 @@
etc/gconf/gconf.xml.defaults/system/%gconf.xml
etc/gconf/gconf.xml.defaults/system/http_proxy/%gconf.xml
etc/gconf/schemas/system_http_proxy.schemas
+%%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf
etc/gnome-vfs-2.0/modules/default-modules.conf
etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info
etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info
@@ -50,6 +51,7 @@
include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h
lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
lib/gnome-vfs-2.0/modules/libbzip2.so
+%%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so
lib/gnome-vfs-2.0/modules/libextfs.so
lib/gnome-vfs-2.0/modules/libfile.so
lib/gnome-vfs-2.0/modules/libftp.so
--Boundary-00=_XWlR+w/r/2FH06O
Content-Type: text/x-csrc;
charset="iso-8859-1";
name="patch-modules_cdda-method.c"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="patch-modules_cdda-method.c"
--- modules/cdda-method.c.orig Sun Feb 9 12:49:38 2003
+++ modules/cdda-method.c Sun Feb 9 12:49:45 2003
@@ -623,7 +623,7 @@
// Check and see if we already have opened and stashed this drive
if (!use_base) {
if (global_context != NULL) {
- if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) {
+ if (strcmp (drive->dev->device_name, global_context->drive->dev->device_name) == 0) {
use_cache = TRUE;
cdda_close (drive);
gnome_vfs_file_info_copy (file_info, global_context->file_info);
@@ -709,7 +709,7 @@
if (!use_base) {
// Check for cache
if (global_context != NULL) {
- if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) {
+ if (strcmp (drive->dev->device_name, global_context->drive->dev->device_name) != 0) {
// Clear old cache
cdda_context_free (global_context);
global_context = cdda_context_new (drive, uri);
--Boundary-00=_XWlR+w/r/2FH06O--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-gnome" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302091420.23973.avleeuwen>