1.1.0 version bump. Ported existing patches, added gcc-4.1 patch. It should fix bug 118161.

(Portage version: 2.0.53)

7 files changed, 171 insertions, 8 deletions

diff --git a/media-libs/libptp2/ChangeLog b/media-libs/libptp2/ChangeLog
index 01f163b22ae2..205d4f126705 100644
--- a/media-libs/libptp2/ChangeLog
+++ b/media-libs/libptp2/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/libptp2
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libptp2/ChangeLog,v 1.9 2005/09/12 22:48:22 hansmi Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libptp2/ChangeLog,v 1.10 2006/01/07 22:22:31 vanquirius Exp $
+
+*libptp2-1.1.0 (07 Jan 2006)
+
+  07 Jan 2006; Marcelo Goes <vanquirius@gentoo.org>
+  +files/libptp2-1.1.0-gcc41.patch,
+  +files/libptp2-1.1.0-libusbversion.patch,
+  +files/libptp2-1.1.0-parallel.patch, +libptp2-1.1.0.ebuild:
+  1.1.0 version bump. Ported existing patches, added gcc-4.1 patch. It should
+  fix bug 118161.
 
   12 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> libptp2-1.0.2.ebuild:
   Stable on ppc.
diff --git a/media-libs/libptp2/Manifest b/media-libs/libptp2/Manifest
index ecab49d20e11..86ccfcf09e62 100644
--- a/media-libs/libptp2/Manifest
+++ b/media-libs/libptp2/Manifest
@@ -1,9 +1,14 @@
-MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
 MD5 39b00a002711fc8c897f14be6f06bada ChangeLog 1525
-MD5 df0c4e3c054f1496afede819ee11f992 libptp2-1.0.1.ebuild 984
-MD5 8f0341bbba19e6e04eaa43fae8c62dea libptp2-1.0.2.ebuild 1032
-MD5 a6f70bf32535c44ad3f82a74e5232021 files/digest-libptp2-1.0.2 65
-MD5 040d61e7bc729957412db55415d36f0c files/libptp2-1.0.2-parallel.patch 2797
 MD5 20edc79b41d07fe8e2db6a2448c7e2cf files/digest-libptp2-1.0.1 65
-MD5 1ceef90a5e44b56ab54b1e8634695d6c files/libptp2-1.0.2-libusbversion.patch 495
+MD5 a6f70bf32535c44ad3f82a74e5232021 files/digest-libptp2-1.0.2 65
+MD5 372a0d44ed072393b6a3fb2993914dbf files/digest-libptp2-1.1.0 65
 MD5 8138ffc75e460e62c0818880936a84af files/libptp2-1.0.1-libusbversion.patch 470
+MD5 1ceef90a5e44b56ab54b1e8634695d6c files/libptp2-1.0.2-libusbversion.patch 495
+MD5 040d61e7bc729957412db55415d36f0c files/libptp2-1.0.2-parallel.patch 2797
+MD5 d810c23a1b28674b118051656e9ad519 files/libptp2-1.1.0-gcc41.patch 1164
+MD5 6131a64ee74924dc8d3ce06e338e3a3a files/libptp2-1.1.0-libusbversion.patch 498
+MD5 ea29f511dde15496bd7a1ef5f4edbfa7 files/libptp2-1.1.0-parallel.patch 2310
+MD5 df0c4e3c054f1496afede819ee11f992 libptp2-1.0.1.ebuild 984
+MD5 8f0341bbba19e6e04eaa43fae8c62dea libptp2-1.0.2.ebuild 1032
+MD5 2c8bd495d903fd2bc3b8e043a5467134 libptp2-1.1.0.ebuild 1102
+MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
diff --git a/media-libs/libptp2/files/digest-libptp2-1.1.0 b/media-libs/libptp2/files/digest-libptp2-1.1.0
new file mode 100644
index 000000000000..0f8b58d5f354
--- /dev/null
+++ b/media-libs/libptp2/files/digest-libptp2-1.1.0
@@ -0,0 +1 @@
+MD5 24554b5028d8987775ac197249e06752 libptp2-1.1.0.tar.gz 359744
diff --git a/media-libs/libptp2/files/libptp2-1.1.0-gcc41.patch b/media-libs/libptp2/files/libptp2-1.1.0-gcc41.patch
new file mode 100644
index 000000000000..2837980cca58
--- /dev/null
+++ b/media-libs/libptp2/files/libptp2-1.1.0-gcc41.patch
@@ -0,0 +1,35 @@
+--- libptp2-1.1.0.orig/src/ptp-pack.c	2006-01-07 19:38:52.000000000 -0200
++++ libptp2-1.1.0/src/ptp-pack.c	2006-01-07 19:56:26.000000000 -0200
+@@ -440,7 +440,7 @@
+ 		case PTP_DTC_STR:
+ 		{
+ 			uint8_t len;
+-			(char *)(*value)=ptp_unpack_string(params,data,0,&len);
++			(*value)=(char *)ptp_unpack_string(params,data,0,&len);
+ 			break;
+ 		}
+ 	}
+@@ -513,10 +513,10 @@
+ 		/* XXX: other int types are unimplemented */
+ 		/* XXX: int arrays are unimplemented also */
+ 		case PTP_DTC_STR:
+-			(char *)dpd->FactoryDefaultValue = ptp_unpack_string
++			dpd->FactoryDefaultValue = (char *)ptp_unpack_string
+ 				(params,data,PTP_dpd_FactoryDefaultValue,&len);
+ 			totallen=len*2+1;
+-			(char *)dpd->CurrentValue = ptp_unpack_string
++			dpd->CurrentValue = (char *)ptp_unpack_string
+ 				(params, data, PTP_dpd_FactoryDefaultValue + 
+ 				totallen, &len);
+ 			totallen+=len*2+1;
+@@ -598,8 +598,8 @@
+ 			int i;
+ 			for(i=0;i<N;i++)
+ 			{
+-				(char *)dpd->FORM.Enum.SupportedValue[i]=
+-					ptp_unpack_string
++				dpd->FORM.Enum.SupportedValue[i]=
++					(char *)ptp_unpack_string
+ 					(params,data,PTP_dpd_FactoryDefaultValue
+ 					+totallen,&len);
+ 				totallen+=len*2+1;
diff --git a/media-libs/libptp2/files/libptp2-1.1.0-libusbversion.patch b/media-libs/libptp2/files/libptp2-1.1.0-libusbversion.patch
new file mode 100644
index 000000000000..b5d36f05f32b
--- /dev/null
+++ b/media-libs/libptp2/files/libptp2-1.1.0-libusbversion.patch
@@ -0,0 +1,11 @@
+--- libptp2-1.1.0.orig/configure	2006-01-07 19:38:52.000000000 -0200
++++ libptp2-1.1.0/configure	2006-01-07 19:47:30.000000000 -0200
+@@ -21773,7 +21773,7 @@
+ 		LDFLAGS="$LDFLAGS_save"
+ 	fi
+ 
+-	if test "$LIBUSB_VER" \< "0.1.08"; then
++	if test "$LIBUSB_VER" \< "0.1.08" && test "$LIBUSB_VER" != "0.1.10a"; then
+ 		{ { echo "$as_me:$LINENO: error:
+ *** You need at least version 0.1.8 of the libusb library to build ptpcam.
+ *** Download and istall it from http://sourceforge.net/projects/libusb/ or
diff --git a/media-libs/libptp2/files/libptp2-1.1.0-parallel.patch b/media-libs/libptp2/files/libptp2-1.1.0-parallel.patch
new file mode 100644
index 000000000000..32ea925fdcae
--- /dev/null
+++ b/media-libs/libptp2/files/libptp2-1.1.0-parallel.patch
@@ -0,0 +1,64 @@
+--- libptp2-1.1.0.orig/src/Makefile.am	2006-01-07 19:38:52.000000000 -0200
++++ libptp2-1.1.0/src/Makefile.am	2006-01-07 20:00:01.000000000 -0200
+@@ -17,7 +17,7 @@
+ else 
+ ptpcam_SOURCES = ptpcam.c ptpcam.h
+ endif
+-ptpcam_LDADD = -lptp2 @PTPCAM_LDFLAGS@
++ptpcam_LDADD = libptp2.la @PTPCAM_LDFLAGS@
+ ptpcam_DEPENDANCIES = libptp2.la
+ ptpcam_CFLAGS = @PTPCAM_CFLAGS@
+ endif
+--- libptp2-1.1.0.orig/src/Makefile.in	2006-01-07 19:38:52.000000000 -0200
++++ libptp2-1.1.0/src/Makefile.in	2006-01-07 20:00:48.000000000 -0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -16,8 +16,6 @@
+ 
+ 
+ 
+-SOURCES = $(libptp2_la_SOURCES) $(ptpcam_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -45,8 +43,7 @@
+ DIST_COMMON = $(libptp2include_HEADERS) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/byteorder.m4 \
+-	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+ mkinstalldirs = $(install_sh) -d
+@@ -74,7 +71,7 @@
+ @LINUX_OS_TRUE@@PTPCAM_TRUE@	ptpcam-ptpcam.$(OBJEXT) \
+ @LINUX_OS_TRUE@@PTPCAM_TRUE@	ptpcam-myusb.$(OBJEXT)
+ ptpcam_OBJECTS = $(am_ptpcam_OBJECTS)
+-ptpcam_DEPENDENCIES =
++@PTPCAM_TRUE@ptpcam_DEPENDENCIES = libptp2.la
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -176,7 +173,6 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
+-effective_target = @effective_target@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+@@ -207,7 +203,7 @@
+ DISTCLEANFILES = libptp-stdint.h libptp-endian.h
+ @LINUX_OS_FALSE@@PTPCAM_TRUE@ptpcam_SOURCES = ptpcam.c ptpcam.h
+ @LINUX_OS_TRUE@@PTPCAM_TRUE@ptpcam_SOURCES = ptpcam.c ptpcam.h myusb.c
+-@PTPCAM_TRUE@ptpcam_LDADD = -lptp2 @PTPCAM_LDFLAGS@
++@PTPCAM_TRUE@ptpcam_LDADD = libptp2.la @PTPCAM_LDFLAGS@
+ @PTPCAM_TRUE@ptpcam_DEPENDANCIES = libptp2.la
+ @PTPCAM_TRUE@ptpcam_CFLAGS = @PTPCAM_CFLAGS@
+ all: all-am
diff --git a/media-libs/libptp2/libptp2-1.1.0.ebuild b/media-libs/libptp2/libptp2-1.1.0.ebuild
new file mode 100644
index 000000000000..dd6fd093c714
--- /dev/null
+++ b/media-libs/libptp2/libptp2-1.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libptp2/libptp2-1.1.0.ebuild,v 1.1 2006/01/07 22:22:31 vanquirius Exp $
+
+inherit eutils
+
+DESCRIPTION="Library communicating with PTP enabled devices (digital photo cameras and so on)."
+HOMEPAGE="http://sourceforge.net/projects/libptp/"
+SRC_URI="mirror://sourceforge/libptp/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~ppc64 ~x86"
+IUSE=""
+RDEPEND=">=dev-libs/libusb-0.1.8"
+DEPEND="${RDEPEND}
+	sys-apps/gawk
+	sys-apps/grep"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.1.0-libusbversion.patch
+	epatch "${FILESDIR}"/${PN}-1.1.0-parallel.patch
+	epatch "${FILESDIR}"/${PN}-1.1.0-gcc41.patch
+}
+
+src_test() {
+	if hasq userpriv "${FEATURES}" || hasq sandbox "${FEATURES}" || hasq usersandbox "${FEATURES}";
+	then
+		einfo "Sorry cannot test with userpriv, usersandbox or sandbox features"
+	else
+		env LD_LIBRARY_PATH=./src/.libs/ ./src/ptpcam -l || die "failed test"
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+}