summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Crête <tester@gentoo.org>2009-04-28 15:11:54 +0000
committerOlivier Crête <tester@gentoo.org>2009-04-28 15:11:54 +0000
commit96a95c49d5236b5ba0f1c7c05e472ec2231dd4c3 (patch)
tree642b547134e9471a96d1f25908a69145ecb32135 /media-libs/libgpod/files
parentunmasking mediastreamer as ortp-0.15.0 is unmasked (diff)
downloadgentoo-2-96a95c49d5236b5ba0f1c7c05e472ec2231dd4c3.tar.gz
gentoo-2-96a95c49d5236b5ba0f1c7c05e472ec2231dd4c3.tar.bz2
gentoo-2-96a95c49d5236b5ba0f1c7c05e472ec2231dd4c3.zip
Re-make hal optional, bug #267759
(Portage version: 2.1.6.7/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libgpod/files')
-rw-r--r--media-libs/libgpod/files/libgpod-0.5.2-no-gdk.patch26
-rw-r--r--media-libs/libgpod/files/libgpod-0.7.2-compile-without-hal.patch18
2 files changed, 18 insertions, 26 deletions
diff --git a/media-libs/libgpod/files/libgpod-0.5.2-no-gdk.patch b/media-libs/libgpod/files/libgpod-0.5.2-no-gdk.patch
deleted file mode 100644
index 32bc4938bd1f..000000000000
--- a/media-libs/libgpod/files/libgpod-0.5.2-no-gdk.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- itdb_artwork.c~ 2007-05-07 07:42:09.000000000 -0400
-+++ itdb_artwork.c 2007-06-28 10:41:02.000000000 -0400
-@@ -849,9 +849,11 @@
- g_return_if_fail (thumb);
-
- g_free (thumb->image_data);
-+#ifdef HAVE_GDKPIXBUF
- if (thumb->pixbuf) {
- g_object_unref (G_OBJECT (thumb->pixbuf));
- }
-+#endif
- g_free (thumb->filename);
- g_free (thumb);
- }
-@@ -883,9 +885,11 @@
- memcpy (new_thumb->image_data, thumb->image_data,
- new_thumb->image_data_len);
- }
-+#ifdef HAVE_GDKPIXBUF
- if (thumb->pixbuf) {
- g_object_ref (G_OBJECT (thumb->pixbuf));
- }
-+#endif
- return new_thumb;
- }
-
diff --git a/media-libs/libgpod/files/libgpod-0.7.2-compile-without-hal.patch b/media-libs/libgpod/files/libgpod-0.7.2-compile-without-hal.patch
new file mode 100644
index 000000000000..3a98023aad32
--- /dev/null
+++ b/media-libs/libgpod/files/libgpod-0.7.2-compile-without-hal.patch
@@ -0,0 +1,18 @@
+--- libgpod-0.7.2-orig/tools/Makefile.am 2009-04-15 23:18:36.000000000 +0200
++++ libgpod-0.7.2/tools/Makefile.am 2009-04-28 12:35:43.000000000 +0200
+@@ -1,7 +1,6 @@
+ if HAVE_SGUTILS
+
+ bin_PROGRAMS=ipod-read-sysinfo-extended
+-noinst_PROGRAMS=ipod-time-sync
+
+ ipod_read_sysinfo_extended_SOURCES = \
+ read-sysinfoextended-sgutils.c \
+@@ -12,6 +11,7 @@
+ if HAVE_HAL
+ haldir = $(HALCALLOUTSDIR)
+ hal_PROGRAMS = libgpod-callout
++noinst_PROGRAMS=ipod-time-sync
+
+ libgpod_callout_SOURCES = \
+ hal-callout.c \