From cdf9065afa775bb6e9d25f15b153fd3a24a483a5 Mon Sep 17 00:00:00 2001 From: Jeffrey Gardner Date: Fri, 26 Nov 2010 17:49:56 +0000 Subject: latest version, trying to escape compilation error in 2.4.10 - st2205/st2205_decode.c:425:1: error: expected identifier or '(' before '{' token svn path=/; revision=305 --- .../files/libgphoto2-2.4.7-no-test-build.patch | 34 ++++++++++++++++++++++ .../files/libgphoto2-2.4.7-respect-bonjour.patch | 12 ++++++++ .../libgphoto2-2.4.8-increase_max_entries.patch | 15 ++++++++++ .../libgphoto2/files/libgphoto2-2.4.9-dnl.patch | 24 +++++++++++++++ 4 files changed, 85 insertions(+) create mode 100644 media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch create mode 100644 media-libs/libgphoto2/files/libgphoto2-2.4.7-respect-bonjour.patch create mode 100644 media-libs/libgphoto2/files/libgphoto2-2.4.8-increase_max_entries.patch create mode 100644 media-libs/libgphoto2/files/libgphoto2-2.4.9-dnl.patch (limited to 'media-libs/libgphoto2/files') diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch new file mode 100644 index 0000000..9fcabd9 --- /dev/null +++ b/media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch @@ -0,0 +1,34 @@ +# Do not build tests if not running make check +# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=226241 +--- a/libgphoto2_port/test/Makefile.am 2010-01-07 01:04:40.000000000 +0100 ++++ b/libgphoto2_port/test/Makefile.am 2010-01-07 01:04:57.000000000 +0100 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = test-gp-port ++check_PROGRAMS = test-gp-port + + test_gp_port_CPPFLAGS = \ + $(AM_CPPFLAGS) $(CPPFLAGS) \ +--- a/tests/Makefile.am 2010-01-07 00:56:14.000000000 +0100 ++++ b/tests/Makefile.am 2010-01-07 00:56:40.000000000 +0100 +@@ -2,7 +2,9 @@ + + check_PROGRAMS = \ + test-camera-list \ +- test-pedantic-c ++ test-pedantic-c \ ++ test-gphoto2 \ ++ test-filesys + + if HAVE_CXX + check_PROGRAMS += test-pedantic-cxx +@@ -22,10 +24,6 @@ + + CLEANFILES = $(check_SCRIPTS) + +-noinst_PROGRAMS = \ +- test-gphoto2 \ +- test-filesys +- + test_gphoto2_SOURCE = test-gphoto2.c + test_gphoto2_LDADD = \ + $(top_builddir)/libgphoto2/libgphoto2.la \ diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.7-respect-bonjour.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.7-respect-bonjour.patch new file mode 100644 index 0000000..fc10aec --- /dev/null +++ b/media-libs/libgphoto2/files/libgphoto2-2.4.7-respect-bonjour.patch @@ -0,0 +1,12 @@ +# Make sure with_bonjour value gets set by corresponding AC_ARG_WITH +# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=283332 +--- a/libgphoto2_port/configure.ac 2010-01-07 00:25:53.000000000 +0100 ++++ b/libgphoto2_port/configure.ac 2010-01-07 00:25:43.000000000 +0100 +@@ -161,7 +161,6 @@ + dnl --------------------------------------------------------------------------- + dnl Apple Bonjour / mDNSResponder multicast DNS queries. + dnl --------------------------------------------------------------------------- +-with_bonjour=no + AC_ARG_WITH([bonjour], + AS_HELP_STRING([--without-bonjour], [whether to exclude Bonjour PTP/IP autodetection]), + , diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.8-increase_max_entries.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.8-increase_max_entries.patch new file mode 100644 index 0000000..16aadd1 --- /dev/null +++ b/media-libs/libgphoto2/files/libgphoto2-2.4.8-increase_max_entries.patch @@ -0,0 +1,15 @@ +Increase max entries from 1024 to 8192 until +http://sourceforge.net/tracker/index.php?func=detail&aid=1515453&group_id=8874&atid=108874 +fix is backported to 2.4 branch. +This fixes http://bugs.gentoo.org/show_bug.cgi?id=291049 +--- a/libgphoto2/gphoto2-list.c ++++ b/libgphoto2/gphoto2-list.c +@@ -72,7 +72,7 @@ + + #ifdef CAMERALIST_STRUCT_COMPATIBILITY + +-#define MAX_ENTRIES 1024 ++#define MAX_ENTRIES 8192 + #define MAX_LIST_STRING_LENGTH 128 + struct _CameraList { + int count; diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.9-dnl.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.9-dnl.patch new file mode 100644 index 0000000..8ee30ba --- /dev/null +++ b/media-libs/libgphoto2/files/libgphoto2-2.4.9-dnl.patch @@ -0,0 +1,24 @@ +http://bugs.gentoo.org/336598 + +--- libgphoto2_port/m4/gp-libltdl.m4 ++++ libgphoto2_port/m4/gp-libltdl.m4 +@@ -23,7 +23,7 @@ + + Please make sure that the proper development package is installed + (libltdl-dev, libtool-ltdl-devel, etc.) +-])dnl ++])[]dnl + ])dnl + ]) + else +--- m4m/gp-libltdl.m4 ++++ m4m/gp-libltdl.m4 +@@ -23,7 +23,7 @@ + + Please make sure that the proper development package is installed + (libltdl-dev, libtool-ltdl-devel, etc.) +-])dnl ++])[]dnl + ])dnl + ]) + else -- cgit v1.2.3-18-g5258