From d914301a5453a07087588e4557d008c87caf1a74 Mon Sep 17 00:00:00 2001 From: "Michael Mair-Keimberger (asterix)" Date: Wed, 28 Dec 2016 17:07:48 +0100 Subject: media-libs/libptp2: remove unused patches --- media-libs/libptp2/files/libptp2-1.1.0-gcc41.patch | 35 ------------ .../files/libptp2-1.1.0-libusbversion.patch | 11 ---- .../libptp2/files/libptp2-1.1.0-parallel.patch | 64 ---------------------- 3 files changed, 110 deletions(-) delete mode 100644 media-libs/libptp2/files/libptp2-1.1.0-gcc41.patch delete mode 100644 media-libs/libptp2/files/libptp2-1.1.0-libusbversion.patch delete mode 100644 media-libs/libptp2/files/libptp2-1.1.0-parallel.patch diff --git a/media-libs/libptp2/files/libptp2-1.1.0-gcc41.patch b/media-libs/libptp2/files/libptp2-1.1.0-gcc41.patch deleted file mode 100644 index 2837980cca58..000000000000 --- a/media-libs/libptp2/files/libptp2-1.1.0-gcc41.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- 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;iFORM.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 deleted file mode 100644 index b5d36f05f32b..000000000000 --- a/media-libs/libptp2/files/libptp2-1.1.0-libusbversion.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 32ea925fdcae..000000000000 --- a/media-libs/libptp2/files/libptp2-1.1.0-parallel.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- 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 -- cgit v1.2.3-65-gdbad