1 |
pacho 13/11/22 20:59:58 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: libgphoto2-2.5.2-r1.ebuild |
5 |
Removed: libgphoto2-2.5.2.ebuild |
6 |
Log: |
7 |
Apply important fixes: solve libxml2 detection, update configure options, rely on udev >= 175, update cameras (#484276 by Nikoli and Evgeny Bobkin, also solving #484276 by Michael Rowell); drop old. |
8 |
|
9 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) |
10 |
|
11 |
Revision Changes Path |
12 |
1.239 media-libs/libgphoto2/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.239&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.239&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?r1=1.238&r2=1.239 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v |
21 |
retrieving revision 1.238 |
22 |
retrieving revision 1.239 |
23 |
diff -u -r1.238 -r1.239 |
24 |
--- ChangeLog 10 Oct 2013 18:40:36 -0000 1.238 |
25 |
+++ ChangeLog 22 Nov 2013 20:59:58 -0000 1.239 |
26 |
@@ -1,6 +1,16 @@ |
27 |
# ChangeLog for media-libs/libgphoto2 |
28 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.238 2013/10/10 18:40:36 pacho Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.239 2013/11/22 20:59:58 pacho Exp $ |
31 |
+ |
32 |
+*libgphoto2-2.5.2-r1 (22 Nov 2013) |
33 |
+ |
34 |
+ 22 Nov 2013; Pacho Ramos <pacho@g.o> |
35 |
+ +files/libgphoto2-2.5.2-libxml2-detection.patch, |
36 |
+ +files/libgphoto2-2.5.2-libxml2-detection2.patch, +libgphoto2-2.5.2-r1.ebuild, |
37 |
+ -libgphoto2-2.5.2.ebuild: |
38 |
+ Apply important fixes: solve libxml2 detection, update configure options, rely |
39 |
+ on udev >= 175, update cameras (#484276 by Nikoli and Evgeny Bobkin, also |
40 |
+ solving #484276 by Michael Rowell); drop old. |
41 |
|
42 |
10 Oct 2013; Pacho Ramos <pacho@g.o> -libgphoto2-2.5.1.1.ebuild, |
43 |
libgphoto2-2.5.2.ebuild: |
44 |
|
45 |
|
46 |
|
47 |
1.1 media-libs/libgphoto2/libgphoto2-2.5.2-r1.ebuild |
48 |
|
49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.2-r1.ebuild?rev=1.1&view=markup |
50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.2-r1.ebuild?rev=1.1&content-type=text/plain |
51 |
|
52 |
Index: libgphoto2-2.5.2-r1.ebuild |
53 |
=================================================================== |
54 |
# Copyright 1999-2013 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.2-r1.ebuild,v 1.1 2013/11/22 20:59:58 pacho Exp $ |
57 |
|
58 |
# TODO |
59 |
# 1. Track upstream bug --disable-docs does not work. |
60 |
# http://sourceforge.net/tracker/index.php?func=detail&aid=1643870&group_id=8874&atid=108874 |
61 |
|
62 |
EAPI="5" |
63 |
|
64 |
inherit autotools eutils multilib udev user |
65 |
|
66 |
DESCRIPTION="Library that implements support for numerous digital cameras" |
67 |
HOMEPAGE="http://www.gphoto.org/" |
68 |
SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2" |
69 |
|
70 |
LICENSE="GPL-2" |
71 |
SLOT="0/6" # libgphoto2.so soname version |
72 |
|
73 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux" |
74 |
IUSE="doc examples exif gd jpeg nls zeroconf" |
75 |
|
76 |
# By default, drivers for all supported cameras will be compiled. |
77 |
# If you want to only compile for specific camera(s), set CAMERAS |
78 |
# environment to a space-separated list (no commas) of drivers that |
79 |
# you want to build. |
80 |
IUSE_CAMERAS=" |
81 |
adc65 agfa_cl20 aox ax203 |
82 |
barbie |
83 |
canon casio_qv clicksmart310 |
84 |
digigr8 digita dimagev dimera3500 directory |
85 |
enigma13 |
86 |
fuji |
87 |
gsmart300 |
88 |
hp215 |
89 |
iclick |
90 |
jamcam jd11 jl2005a jl2005c |
91 |
kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150 |
92 |
largan lg_gsm |
93 |
mars mustek |
94 |
panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2 |
95 |
ricoh ricoh_g3 |
96 |
samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z |
97 |
toshiba_pdrm11 topfield tp6801 |
98 |
" |
99 |
|
100 |
for camera in ${IUSE_CAMERAS}; do |
101 |
IUSE="${IUSE} cameras_${camera}" |
102 |
done |
103 |
|
104 |
# libgphoto2 actually links to libtool |
105 |
RDEPEND=" |
106 |
dev-libs/libxml2:2 |
107 |
sys-devel/libtool |
108 |
virtual/libusb:0 |
109 |
cameras_ax203? ( media-libs/gd:= ) |
110 |
cameras_st2205? ( media-libs/gd:= ) |
111 |
exif? ( >=media-libs/libexif-0.5.9:= ) |
112 |
gd? ( media-libs/gd[jpeg=] ) |
113 |
jpeg? ( virtual/jpeg ) |
114 |
zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) |
115 |
" |
116 |
DEPEND="${RDEPEND} |
117 |
sys-devel/flex |
118 |
>=sys-devel/gettext-0.14.1 |
119 |
virtual/pkgconfig |
120 |
doc? ( app-doc/doxygen ) |
121 |
" |
122 |
# FIXME: gtk-doc is broken |
123 |
# >=dev-util/gtk-doc-1.10 )" |
124 |
|
125 |
RDEPEND="${RDEPEND} |
126 |
!<sys-fs/udev-175" |
127 |
|
128 |
pkg_pretend() { |
129 |
if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then |
130 |
einfo "No camera drivers will be built since you did not specify any." |
131 |
fi |
132 |
} |
133 |
|
134 |
pkg_setup() { |
135 |
enewgroup plugdev |
136 |
} |
137 |
|
138 |
src_prepare() { |
139 |
# Handle examples ourselves |
140 |
sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ |
141 |
|| die "examples sed failed" |
142 |
|
143 |
# Fix pkgconfig file when USE="-exif" |
144 |
if ! use exif; then |
145 |
sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in || die " libgphoto2.pc sed failed" |
146 |
fi |
147 |
|
148 |
# Leave GCC debug builds under user control |
149 |
sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \ |
150 |
-i configure.ac libgphoto2_port/configure.ac || die |
151 |
|
152 |
sed -e 's/sleep 2//' -i m4m/gp-camlibs.m4 || die |
153 |
|
154 |
# Fix USE=zeroconf, bug #283332 |
155 |
epatch "${FILESDIR}/${PN}-2.4.7-respect-bonjour.patch" |
156 |
|
157 |
# Fix libxml2 detection, bug #491782 |
158 |
epatch "${FILESDIR}"/${PN}-2.5.2-libxml2-detection{,2}.patch |
159 |
|
160 |
eautoreconf |
161 |
} |
162 |
|
163 |
src_configure() { |
164 |
local cameras |
165 |
local cam |
166 |
local cam_warn=no |
167 |
for cam in ${IUSE_CAMERAS} ; do |
168 |
if use "cameras_${cam}"; then |
169 |
cameras="${cameras},${cam}" |
170 |
else |
171 |
cam_warn=yes |
172 |
fi |
173 |
done |
174 |
|
175 |
if [ "${cam_warn}" = "yes" ]; then |
176 |
[ -z "${cameras}" ] || cameras="${cameras:1}" |
177 |
einfo "Enabled camera drivers: ${cameras:-none}" |
178 |
ewarn "Upstream will not support you if you do not compile all camera drivers first" |
179 |
else |
180 |
cameras="all" |
181 |
einfo "Enabled camera drivers: all" |
182 |
fi |
183 |
|
184 |
local myconf |
185 |
use doc || myconf="ac_cv_path_DOXYGEN=false" |
186 |
|
187 |
# Upstream doesn't default to --enable-option-checking due having another |
188 |
# configure in libgphoto2_port/ that also needs to be checked on every bump |
189 |
econf \ |
190 |
--disable-docs \ |
191 |
--disable-gp2ddb \ |
192 |
$(use_with zeroconf bonjour) \ |
193 |
$(use_enable nls) \ |
194 |
$(use_with exif libexif auto) \ |
195 |
$(use_with gd) \ |
196 |
$(use_with jpeg) \ |
197 |
--with-camlibs=${cameras} \ |
198 |
--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \ |
199 |
--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
200 |
--with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \ |
201 |
--with-rpmbuild=$(type -P true) \ |
202 |
udevscriptdir="$(udev_get_udevdir)" \ |
203 |
${myconf} |
204 |
|
205 |
# FIXME: gtk-doc is currently broken |
206 |
# $(use_enable doc docs) |
207 |
} |
208 |
|
209 |
src_compile() { |
210 |
default |
211 |
|
212 |
if use doc; then |
213 |
doxygen doc/Doxyfile || die "Documentation generation failed" |
214 |
fi |
215 |
} |
216 |
|
217 |
src_install() { |
218 |
default |
219 |
|
220 |
# Empty dependency_libs in .la files, bug #386665 |
221 |
find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + |
222 |
|
223 |
# Clean up unwanted files |
224 |
rm "${ED}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed" |
225 |
dodoc ChangeLog NEWS* README* AUTHORS TESTERS MAINTAINERS HACKING |
226 |
|
227 |
if use examples; then |
228 |
insinto /usr/share/doc/${PF}/examples |
229 |
doins examples/README examples/*.c examples/*.h |
230 |
fi |
231 |
|
232 |
# FIXME: fixup autoconf bug |
233 |
if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then |
234 |
rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html" |
235 |
fi |
236 |
# end fixup |
237 |
|
238 |
local udev_rules cam_list |
239 |
udev_rules="$(udev_get_udevdir)/rules.d/70-libgphoto2.rules" |
240 |
cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list" |
241 |
|
242 |
if [ -x "${ED}"${cam_list} ]; then |
243 |
# Let print-camera-list find libgphoto2.so |
244 |
export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)" |
245 |
# Let libgphoto2 find its camera-modules |
246 |
export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}" |
247 |
|
248 |
einfo "Generating UDEV-rules ..." |
249 |
mkdir -p "${ED}"/${udev_rules%/*} |
250 |
echo -e "# do not edit this file, it will be overwritten on update\n#" \ |
251 |
> "${ED}"/${udev_rules} |
252 |
"${ED}"${cam_list} udev-rules version 175 group plugdev >> "${ED}"/${udev_rules} \ |
253 |
|| die "failed to create udev-rules" |
254 |
else |
255 |
eerror "Unable to find print-camera-list" |
256 |
eerror "and therefore unable to generate hotplug usermap." |
257 |
eerror "You will have to manually generate it by running:" |
258 |
eerror " ${cam_list} udev-rules version 175 group plugdev > ${udev_rules}" |
259 |
fi |
260 |
|
261 |
} |
262 |
|
263 |
pkg_postinst() { |
264 |
if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" ; then |
265 |
elog "Don't forget to add yourself to the plugdev group " |
266 |
elog "if you want to be able to access your camera." |
267 |
fi |
268 |
|
269 |
local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules |
270 |
if [[ -f ${old_udev_rules} ]]; then |
271 |
rm -f "${old_udev_rules}" |
272 |
fi |
273 |
} |