| 1 |
eva 10/01/07 00:28:43 |
| 2 |
|
| 3 |
Added: libgphoto2-2.4.7-respect-bonjour.patch |
| 4 |
libgphoto2-2.4.7-no-test-build.patch |
| 5 |
libgphoto2-2.4.7-extra-dist.patch |
| 6 |
Log: |
| 7 |
Fix USE=bonjour behavior, bug #283332. Do not build tests if not needed, bug #226241. Add examples USE flag. Remove unwanted files for /usr/share/doc. Clean up old revisions. |
| 8 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 media-libs/libgphoto2/files/libgphoto2-2.4.7-respect-bonjour.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libgphoto2/files/libgphoto2-2.4.7-respect-bonjour.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libgphoto2/files/libgphoto2-2.4.7-respect-bonjour.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: libgphoto2-2.4.7-respect-bonjour.patch |
| 17 |
=================================================================== |
| 18 |
# Make sure with_bonjour value gets set by corresponding AC_ARG_WITH |
| 19 |
# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=283332 |
| 20 |
--- a/libgphoto2_port/configure.ac 2010-01-07 00:25:53.000000000 +0100 |
| 21 |
+++ b/libgphoto2_port/configure.ac 2010-01-07 00:25:43.000000000 +0100 |
| 22 |
@@ -161,7 +161,6 @@ |
| 23 |
dnl --------------------------------------------------------------------------- |
| 24 |
dnl Apple Bonjour / mDNSResponder multicast DNS queries. |
| 25 |
dnl --------------------------------------------------------------------------- |
| 26 |
-with_bonjour=no |
| 27 |
AC_ARG_WITH([bonjour], |
| 28 |
AS_HELP_STRING([--without-bonjour], [whether to exclude Bonjour PTP/IP autodetection]), |
| 29 |
, |
| 30 |
|
| 31 |
|
| 32 |
|
| 33 |
1.1 media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch |
| 34 |
|
| 35 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch?rev=1.1&view=markup |
| 36 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch?rev=1.1&content-type=text/plain |
| 37 |
|
| 38 |
Index: libgphoto2-2.4.7-no-test-build.patch |
| 39 |
=================================================================== |
| 40 |
# Do not build tests if not running make check |
| 41 |
# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=226241 |
| 42 |
--- a/libgphoto2_port/test/Makefile.am 2010-01-07 01:04:40.000000000 +0100 |
| 43 |
+++ b/libgphoto2_port/test/Makefile.am 2010-01-07 01:04:57.000000000 +0100 |
| 44 |
@@ -1,4 +1,4 @@ |
| 45 |
-noinst_PROGRAMS = test-gp-port |
| 46 |
+check_PROGRAMS = test-gp-port |
| 47 |
|
| 48 |
test_gp_port_CPPFLAGS = \ |
| 49 |
$(AM_CPPFLAGS) $(CPPFLAGS) \ |
| 50 |
--- a/tests/Makefile.am 2010-01-07 00:56:14.000000000 +0100 |
| 51 |
+++ b/tests/Makefile.am 2010-01-07 00:56:40.000000000 +0100 |
| 52 |
@@ -2,7 +2,9 @@ |
| 53 |
|
| 54 |
check_PROGRAMS = \ |
| 55 |
test-camera-list \ |
| 56 |
- test-pedantic-c |
| 57 |
+ test-pedantic-c \ |
| 58 |
+ test-gphoto2 \ |
| 59 |
+ test-filesys |
| 60 |
|
| 61 |
if HAVE_CXX |
| 62 |
check_PROGRAMS += test-pedantic-cxx |
| 63 |
@@ -22,10 +24,6 @@ |
| 64 |
|
| 65 |
CLEANFILES = $(check_SCRIPTS) |
| 66 |
|
| 67 |
-noinst_PROGRAMS = \ |
| 68 |
- test-gphoto2 \ |
| 69 |
- test-filesys |
| 70 |
- |
| 71 |
test_gphoto2_SOURCE = test-gphoto2.c |
| 72 |
test_gphoto2_LDADD = \ |
| 73 |
$(top_builddir)/libgphoto2/libgphoto2.la \ |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
1.1 media-libs/libgphoto2/files/libgphoto2-2.4.7-extra-dist.patch |
| 78 |
|
| 79 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libgphoto2/files/libgphoto2-2.4.7-extra-dist.patch?rev=1.1&view=markup |
| 80 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libgphoto2/files/libgphoto2-2.4.7-extra-dist.patch?rev=1.1&content-type=text/plain |
| 81 |
|
| 82 |
Index: libgphoto2-2.4.7-extra-dist.patch |
| 83 |
=================================================================== |
| 84 |
# Fix re-definition of EXTRA_DIST |
| 85 |
--- a/libgphoto2_port/usb/Makefile.am 2010-01-07 00:25:35.000000000 +0100 |
| 86 |
+++ b/libgphoto2_port/usb/Makefile.am 2010-01-07 00:25:28.000000000 +0100 |
| 87 |
@@ -8,7 +8,7 @@ |
| 88 |
check_mtp_device_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBUSB_CFLAGS) |
| 89 |
check_mtp_device_LDADD = $(LIBUSB_LIBS) |
| 90 |
else |
| 91 |
-EXTRA_DIST = check-mtp-device.c |
| 92 |
+EXTRA_DIST += check-mtp-device.c |
| 93 |
endif |
| 94 |
|
| 95 |
usb_la_LDFLAGS = -module -no-undefined -avoid-version \ |
Archives