summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-libs/libptp2
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-libs/libptp2')
-rw-r--r--media-libs/libptp2/Manifest1
-rw-r--r--media-libs/libptp2/files/libptp2-1.1.0-gcc41.patch35
-rw-r--r--media-libs/libptp2/files/libptp2-1.1.0-libusbversion.patch11
-rw-r--r--media-libs/libptp2/files/libptp2-1.1.0-parallel.patch64
-rw-r--r--media-libs/libptp2/files/libptp2-1.1.10-configure.patch46
-rw-r--r--media-libs/libptp2/files/libptp2-1.1.10-makefile.patch11
-rw-r--r--media-libs/libptp2/libptp2-1.1.10.ebuild34
-rw-r--r--media-libs/libptp2/metadata.xml11
8 files changed, 213 insertions, 0 deletions
diff --git a/media-libs/libptp2/Manifest b/media-libs/libptp2/Manifest
new file mode 100644
index 00000000000..93af2d53cce
--- /dev/null
+++ b/media-libs/libptp2/Manifest
@@ -0,0 +1 @@
+DIST libptp2-1.1.10.tar.gz 380767 SHA256 ce9c0c220a24ffecd4c4a2563de9e78137965bc2118c3de53dbfd928cfd92e74
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 00000000000..2837980cca5
--- /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 00000000000..b5d36f05f32
--- /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 00000000000..32ea925fdca
--- /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/files/libptp2-1.1.10-configure.patch b/media-libs/libptp2/files/libptp2-1.1.10-configure.patch
new file mode 100644
index 00000000000..d8f1260f5e3
--- /dev/null
+++ b/media-libs/libptp2/files/libptp2-1.1.10-configure.patch
@@ -0,0 +1,46 @@
+--- libptp2-1.1.10/configure.in.orig 2007-12-28 10:28:36.000000000 +1100
++++ libptp2-1.1.10/configure.in 2007-12-28 10:36:14.000000000 +1100
+@@ -25,6 +25,10 @@
+
+ # Checks for programs.
+ AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++AC_PROG_MAKE_SET
++AC_PROG_RANLIB
+
+ # turn on warnings for gcc
+ if test "$ac_cv_prog_gcc" = "yes"; then
+@@ -36,19 +40,29 @@
+
+ # Checks for header files.
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS([libintl.h stdlib.h string.h])
++AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h stdint.h stdlib.h string.h sys/ioctl.h unistd.h utime.h])
+
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ AC_C_INLINE
++AC_TYPE_INT16_T
++AC_TYPE_INT32_T
++AC_TYPE_INT8_T
+ AC_STRUCT_TM
++AC_TYPE_UINT16_T
++AC_TYPE_UINT32_T
++AC_TYPE_UINT64_T
++AC_TYPE_UINT8_T
+
+ # Checks for library functions.
+-AC_FUNC_ERROR_AT_LINE
++AC_PROG_GCC_TRADITIONAL
+ AC_FUNC_MALLOC
+ AC_FUNC_MKTIME
++AC_FUNC_MMAP
++AC_TYPE_SIGNAL
++AC_FUNC_UTIME_NULL
+ AC_FUNC_VPRINTF
+-AC_CHECK_FUNCS([memset strchr strdup strtol getopt_long])
++AC_CHECK_FUNCS([memset munmap strdup strncasecmp strtol utime])
+
+ hostos=any
+ case $host in
diff --git a/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch b/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch
new file mode 100644
index 00000000000..0e7b5adec8f
--- /dev/null
+++ b/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch
@@ -0,0 +1,11 @@
+--- libptp2-1.1.10.orig/src/Makefile.am 2005-11-01 02:39:40.000000000 +1100
++++ libptp2-1.1.10/src/Makefile.am 2007-12-28 09:51:01.000000000 +1100
+@@ -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
diff --git a/media-libs/libptp2/libptp2-1.1.10.ebuild b/media-libs/libptp2/libptp2-1.1.10.ebuild
new file mode 100644
index 00000000000..e6ce29ddec0
--- /dev/null
+++ b/media-libs/libptp2/libptp2-1.1.10.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="Library and client for communicating with PTP enabled devices (e.g. digital photo cameras)"
+HOMEPAGE="http://sourceforge.net/projects/libptp/"
+SRC_URI="mirror://sourceforge/libptp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND="virtual/libusb:0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-makefile.patch \
+ "${FILESDIR}"/${P}-configure.patch
+
+ AT_M4DIR="m4" eautoreconf
+}
+
+src_test() {
+ env LD_LIBRARY_PATH=./src/.libs/ ./src/ptpcam -l || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+}
diff --git a/media-libs/libptp2/metadata.xml b/media-libs/libptp2/metadata.xml
new file mode 100644
index 00000000000..5747aa45ff9
--- /dev/null
+++ b/media-libs/libptp2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <longdescription/>
+ <upstream>
+ <remote-id type="sourceforge">libptp</remote-id>
+ </upstream>
+</pkgmetadata>