cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for 'iTunes_Control' as well as 'iPod_Control', otherwise

Browse Source 
gnome-mplayer won't detect some older iPod models
(upstream svn revision r2371)

While here, sync WANTLIB.
This commit is contained in:
dcoppa 2012-12-05 14:31:43 +00:00
parent e001ef090a
commit d5065f81aa
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/gnome-mplayer/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.64 2012/10/31 13:22:03 dcoppa Exp $
# $OpenBSD: Makefile,v 1.65 2012/12/05 14:31:43 dcoppa Exp $
COMMENT = GTK+/GNOME frontend for MPlayer
V = 1.0.7
DISTNAME = gnome-mplayer-${V}
REVISION = 0
CATEGORIES = x11 multimedia
@ -18,7 +19,7 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB = GL X11 Xrender Xss atk-1.0 c cairo \
WANTLIB = GL X11 Xext Xrender Xss atk-1.0 c cairo \
cairo-gobject curl dbus-1 dbus-glib-1 \
expat fontconfig freetype gdk-3 \
gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmlib \

19
x11/gnome-mplayer/patches/patch-src_support_c Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_support_c,v 1.10 2012/12/05 14:31:43 dcoppa Exp $
Check for 'iTunes_Control' as well as 'iPod_Control', otherwise
gnome-mplayer won't detect some older iPod models
(upstream svn revision r2371)
--- src/support.c.orig Wed Dec 5 15:58:22 2012
+++ src/support.c Wed Dec 5 16:00:03 2012
@@ -2286,6 +2286,10 @@ gchar *find_gpod_mount_point()
if (g_file_test(pathname, G_FILE_TEST_IS_DIR))
ret = g_strdup(mnt->mnt_dir);
g_free(pathname);
+ pathname = g_strdup_printf("%s/iTunes_Control", mnt->mnt_dir);
+ if (g_file_test(pathname, G_FILE_TEST_IS_DIR))
+ ret = g_strdup(mnt->mnt_dir);
+ g_free(pathname);
}
}
while (mnt);