Gentoo Archives: gentoo-commits

From: "Göktürk Yüksek" <gokturk@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libptp2/files/
Date: Wed, 28 Dec 2016 16:49:17
Message-Id: 1482943674.d914301a5453a07087588e4557d008c87caf1a74.gokturk@gentoo
1 commit: d914301a5453a07087588e4557d008c87caf1a74
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Dec 28 16:07:48 2016 +0000
4 Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 28 16:47:54 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d914301a
7
8 media-libs/libptp2: remove unused patches
9
10 media-libs/libptp2/files/libptp2-1.1.0-gcc41.patch | 35 ------------
11 .../files/libptp2-1.1.0-libusbversion.patch | 11 ----
12 .../libptp2/files/libptp2-1.1.0-parallel.patch | 64 ----------------------
13 3 files changed, 110 deletions(-)
14
15 diff --git a/media-libs/libptp2/files/libptp2-1.1.0-gcc41.patch b/media-libs/libptp2/files/libptp2-1.1.0-gcc41.patch
16 deleted file mode 100644
17 index 2837980..00000000
18 --- a/media-libs/libptp2/files/libptp2-1.1.0-gcc41.patch
19 +++ /dev/null
20 @@ -1,35 +0,0 @@
21 ---- libptp2-1.1.0.orig/src/ptp-pack.c 2006-01-07 19:38:52.000000000 -0200
22 -+++ libptp2-1.1.0/src/ptp-pack.c 2006-01-07 19:56:26.000000000 -0200
23 -@@ -440,7 +440,7 @@
24 - case PTP_DTC_STR:
25 - {
26 - uint8_t len;
27 -- (char *)(*value)=ptp_unpack_string(params,data,0,&len);
28 -+ (*value)=(char *)ptp_unpack_string(params,data,0,&len);
29 - break;
30 - }
31 - }
32 -@@ -513,10 +513,10 @@
33 - /* XXX: other int types are unimplemented */
34 - /* XXX: int arrays are unimplemented also */
35 - case PTP_DTC_STR:
36 -- (char *)dpd->FactoryDefaultValue = ptp_unpack_string
37 -+ dpd->FactoryDefaultValue = (char *)ptp_unpack_string
38 - (params,data,PTP_dpd_FactoryDefaultValue,&len);
39 - totallen=len*2+1;
40 -- (char *)dpd->CurrentValue = ptp_unpack_string
41 -+ dpd->CurrentValue = (char *)ptp_unpack_string
42 - (params, data, PTP_dpd_FactoryDefaultValue +
43 - totallen, &len);
44 - totallen+=len*2+1;
45 -@@ -598,8 +598,8 @@
46 - int i;
47 - for(i=0;i<N;i++)
48 - {
49 -- (char *)dpd->FORM.Enum.SupportedValue[i]=
50 -- ptp_unpack_string
51 -+ dpd->FORM.Enum.SupportedValue[i]=
52 -+ (char *)ptp_unpack_string
53 - (params,data,PTP_dpd_FactoryDefaultValue
54 - +totallen,&len);
55 - totallen+=len*2+1;
56
57 diff --git a/media-libs/libptp2/files/libptp2-1.1.0-libusbversion.patch b/media-libs/libptp2/files/libptp2-1.1.0-libusbversion.patch
58 deleted file mode 100644
59 index b5d36f0..00000000
60 --- a/media-libs/libptp2/files/libptp2-1.1.0-libusbversion.patch
61 +++ /dev/null
62 @@ -1,11 +0,0 @@
63 ---- libptp2-1.1.0.orig/configure 2006-01-07 19:38:52.000000000 -0200
64 -+++ libptp2-1.1.0/configure 2006-01-07 19:47:30.000000000 -0200
65 -@@ -21773,7 +21773,7 @@
66 - LDFLAGS="$LDFLAGS_save"
67 - fi
68 -
69 -- if test "$LIBUSB_VER" \< "0.1.08"; then
70 -+ if test "$LIBUSB_VER" \< "0.1.08" && test "$LIBUSB_VER" != "0.1.10a"; then
71 - { { echo "$as_me:$LINENO: error:
72 - *** You need at least version 0.1.8 of the libusb library to build ptpcam.
73 - *** Download and istall it from http://sourceforge.net/projects/libusb/ or
74
75 diff --git a/media-libs/libptp2/files/libptp2-1.1.0-parallel.patch b/media-libs/libptp2/files/libptp2-1.1.0-parallel.patch
76 deleted file mode 100644
77 index 32ea925..00000000
78 --- a/media-libs/libptp2/files/libptp2-1.1.0-parallel.patch
79 +++ /dev/null
80 @@ -1,64 +0,0 @@
81 ---- libptp2-1.1.0.orig/src/Makefile.am 2006-01-07 19:38:52.000000000 -0200
82 -+++ libptp2-1.1.0/src/Makefile.am 2006-01-07 20:00:01.000000000 -0200
83 -@@ -17,7 +17,7 @@
84 - else
85 - ptpcam_SOURCES = ptpcam.c ptpcam.h
86 - endif
87 --ptpcam_LDADD = -lptp2 @PTPCAM_LDFLAGS@
88 -+ptpcam_LDADD = libptp2.la @PTPCAM_LDFLAGS@
89 - ptpcam_DEPENDANCIES = libptp2.la
90 - ptpcam_CFLAGS = @PTPCAM_CFLAGS@
91 - endif
92 ---- libptp2-1.1.0.orig/src/Makefile.in 2006-01-07 19:38:52.000000000 -0200
93 -+++ libptp2-1.1.0/src/Makefile.in 2006-01-07 20:00:48.000000000 -0200
94 -@@ -1,4 +1,4 @@
95 --# Makefile.in generated by automake 1.9.5 from Makefile.am.
96 -+# Makefile.in generated by automake 1.9.6 from Makefile.am.
97 - # @configure_input@
98 -
99 - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
100 -@@ -16,8 +16,6 @@
101 -
102 -
103 -
104 --SOURCES = $(libptp2_la_SOURCES) $(ptpcam_SOURCES)
105 --
106 - srcdir = @srcdir@
107 - top_srcdir = @top_srcdir@
108 - VPATH = @srcdir@
109 -@@ -45,8 +43,7 @@
110 - DIST_COMMON = $(libptp2include_HEADERS) $(srcdir)/Makefile.am \
111 - $(srcdir)/Makefile.in
112 - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
113 --am__aclocal_m4_deps = $(top_srcdir)/m4/byteorder.m4 \
114 -- $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/configure.in
115 -+am__aclocal_m4_deps = $(top_srcdir)/configure.in
116 - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
117 - $(ACLOCAL_M4)
118 - mkinstalldirs = $(install_sh) -d
119 -@@ -74,7 +71,7 @@
120 - @LINUX_OS_TRUE@@PTPCAM_TRUE@ ptpcam-ptpcam.$(OBJEXT) \
121 - @LINUX_OS_TRUE@@PTPCAM_TRUE@ ptpcam-myusb.$(OBJEXT)
122 - ptpcam_OBJECTS = $(am_ptpcam_OBJECTS)
123 --ptpcam_DEPENDENCIES =
124 -+@PTPCAM_TRUE@ptpcam_DEPENDENCIES = libptp2.la
125 - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
126 - depcomp = $(SHELL) $(top_srcdir)/depcomp
127 - am__depfiles_maybe = depfiles
128 -@@ -176,7 +173,6 @@
129 - build_os = @build_os@
130 - build_vendor = @build_vendor@
131 - datadir = @datadir@
132 --effective_target = @effective_target@
133 - exec_prefix = @exec_prefix@
134 - host = @host@
135 - host_alias = @host_alias@
136 -@@ -207,7 +203,7 @@
137 - DISTCLEANFILES = libptp-stdint.h libptp-endian.h
138 - @LINUX_OS_FALSE@@PTPCAM_TRUE@ptpcam_SOURCES = ptpcam.c ptpcam.h
139 - @LINUX_OS_TRUE@@PTPCAM_TRUE@ptpcam_SOURCES = ptpcam.c ptpcam.h myusb.c
140 --@PTPCAM_TRUE@ptpcam_LDADD = -lptp2 @PTPCAM_LDFLAGS@
141 -+@PTPCAM_TRUE@ptpcam_LDADD = libptp2.la @PTPCAM_LDFLAGS@
142 - @PTPCAM_TRUE@ptpcam_DEPENDANCIES = libptp2.la
143 - @PTPCAM_TRUE@ptpcam_CFLAGS = @PTPCAM_CFLAGS@
144 - all: all-am