1 |
ssuominen 13/05/01 19:09:18 |
2 |
|
3 |
Modified: ChangeLog gtkpod-2.1.3-r1.ebuild |
4 |
Log: |
5 |
Fix building with latest automake-1.13, plus other improvements, see ChangeLog |
6 |
|
7 |
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
8 |
|
9 |
Revision Changes Path |
10 |
1.126 app-pda/gtkpod/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/gtkpod/ChangeLog?rev=1.126&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/gtkpod/ChangeLog?rev=1.126&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/gtkpod/ChangeLog?r1=1.125&r2=1.126 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v |
19 |
retrieving revision 1.125 |
20 |
retrieving revision 1.126 |
21 |
diff -u -r1.125 -r1.126 |
22 |
--- ChangeLog 12 Apr 2013 04:25:34 -0000 1.125 |
23 |
+++ ChangeLog 1 May 2013 19:09:18 -0000 1.126 |
24 |
@@ -1,6 +1,14 @@ |
25 |
# ChangeLog for app-pda/gtkpod |
26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.125 2013/04/12 04:25:34 ssuominen Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.126 2013/05/01 19:09:18 ssuominen Exp $ |
29 |
+ |
30 |
+ 01 May 2013; Samuli Suominen <ssuominen@g.o> gtkpod-2.1.3-r1.ebuild: |
31 |
+ Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER for automake-1.13 |
32 |
+ compability wrt #467598 by Ian Stakenvicius. |
33 |
+ Punt GTK+ related "DEPRECATED" preprocessor flags for forward compability. |
34 |
+ Fix USE="cdr" dependencies since the plug-in links to -lgstreamer-0.10. |
35 |
+ Compress gst-element-check-0.10.m4 to SRC_URI instead of using hard DEPEND |
36 |
+ for media-libs/gstreamer (as required by eautoreconf). |
37 |
|
38 |
12 Apr 2013; Samuli Suominen <ssuominen@g.o> gtkpod-2.1.3-r1.ebuild: |
39 |
Force more recent dev-util/anjuta too in addition to dev-libs/gdl |
40 |
|
41 |
|
42 |
|
43 |
1.6 app-pda/gtkpod/gtkpod-2.1.3-r1.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/gtkpod/gtkpod-2.1.3-r1.ebuild?rev=1.6&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/gtkpod/gtkpod-2.1.3-r1.ebuild?rev=1.6&content-type=text/plain |
47 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/gtkpod/gtkpod-2.1.3-r1.ebuild?r1=1.5&r2=1.6 |
48 |
|
49 |
Index: gtkpod-2.1.3-r1.ebuild |
50 |
=================================================================== |
51 |
RCS file: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-2.1.3-r1.ebuild,v |
52 |
retrieving revision 1.5 |
53 |
retrieving revision 1.6 |
54 |
diff -u -r1.5 -r1.6 |
55 |
--- gtkpod-2.1.3-r1.ebuild 12 Apr 2013 04:25:34 -0000 1.5 |
56 |
+++ gtkpod-2.1.3-r1.ebuild 1 May 2013 19:09:18 -0000 1.6 |
57 |
@@ -1,6 +1,6 @@ |
58 |
# Copyright 1999-2013 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-2.1.3-r1.ebuild,v 1.5 2013/04/12 04:25:34 ssuominen Exp $ |
61 |
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-2.1.3-r1.ebuild,v 1.6 2013/05/01 19:09:18 ssuominen Exp $ |
62 |
|
63 |
EAPI=5 |
64 |
|
65 |
@@ -8,61 +8,70 @@ |
66 |
|
67 |
DESCRIPTION="A graphical user interface to the Apple productline" |
68 |
HOMEPAGE="http://gtkpod.sourceforge.net/" |
69 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
70 |
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz |
71 |
+ http://dev.gentoo.org/~ssuominen/gst-element-check-0.10.m4.xz" |
72 |
|
73 |
LICENSE="GPL-2 FDL-1.2" |
74 |
SLOT="0" |
75 |
KEYWORDS="amd64 x86" |
76 |
IUSE="aac clutter curl cdr flac gstreamer mp3 vorbis webkit" |
77 |
|
78 |
+# watch out for possible musicbrainz:5 compability in next version? |
79 |
COMMON_DEPEND=" |
80 |
>=dev-libs/gdl-3.6:3 |
81 |
>=dev-libs/glib-2.28.5 |
82 |
>=dev-libs/libxml2-2.7.7 |
83 |
>=dev-util/anjuta-3.6 |
84 |
- >=media-libs/libgpod-0.7.0 |
85 |
+ >=media-libs/libgpod-0.8.2:= |
86 |
>=media-libs/libid3tag-0.15 |
87 |
>=x11-libs/gtk+-3.0.8:3 |
88 |
aac? ( media-libs/faad2 ) |
89 |
clutter? ( media-libs/clutter-gtk:1.0 ) |
90 |
curl? ( >=net-misc/curl-7.10 ) |
91 |
- cdr? ( |
92 |
- >=app-cdr/brasero-3 |
93 |
- media-libs/musicbrainz:3 |
94 |
- ) |
95 |
flac? ( media-libs/flac ) |
96 |
- gstreamer? ( >=media-libs/gst-plugins-base-0.10.25:0.10 ) |
97 |
+ gstreamer? ( |
98 |
+ >=media-libs/gstreamer-0.10.25:0.10 |
99 |
+ >=media-libs/gst-plugins-base-0.10.25:0.10 |
100 |
+ cdr? ( |
101 |
+ >=app-cdr/brasero-3 |
102 |
+ media-libs/musicbrainz:3 |
103 |
+ ) |
104 |
+ ) |
105 |
mp3? ( media-sound/lame ) |
106 |
vorbis? ( |
107 |
media-libs/libvorbis |
108 |
media-sound/vorbis-tools |
109 |
) |
110 |
webkit? ( >=net-libs/webkit-gtk-1.3:3 )" |
111 |
+# to pull in at least -flac and -vorbis plugins , but others at the same time |
112 |
RDEPEND="${COMMON_DEPEND} |
113 |
gstreamer? ( media-plugins/gst-plugins-meta:0.10 )" |
114 |
DEPEND="${COMMON_DEPEND} |
115 |
dev-util/intltool |
116 |
- media-libs/gstreamer:0.10 |
117 |
sys-devel/flex |
118 |
sys-devel/gettext |
119 |
virtual/os-headers |
120 |
virtual/pkgconfig" |
121 |
-# media-libs/gstreamer is always required for gst-element-check-0.10.m4 and |
122 |
-# eautoreconf |
123 |
+REQUIRED_USE="cdr? ( gstreamer )" |
124 |
|
125 |
src_prepare() { |
126 |
- # Make sure SLOT="4" is not used. Everyone should move from "3" to "5" directly. |
127 |
- sed -i -e '/PKG_CHECK_MODULES/s:libmusicbrainz4:&sLoT4iSdEpReCaTeD:' configure.ac || die |
128 |
+ epatch \ |
129 |
+ "${FILESDIR}"/${P}-gdl-3.6.patch \ |
130 |
+ "${FILESDIR}"/${P}-gold.patch |
131 |
|
132 |
+ sed -i -e 's:python:python2:' scripts/sync-palm-jppy.py || die |
133 |
+ # punt deprecated flags for forward compability |
134 |
+ # use more widely used musicbrainz:3 instead of :4 |
135 |
+ # use AC_CONFIG_HEADERS for automake-1.13 compability wrt #467598 |
136 |
+ sed -e 's:CLEANLINESS_FLAGS=".*:CLEANLINESS_FLAGS="":' \ |
137 |
+ -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \ |
138 |
+ -e '/PKG_CHECK_MODULES/s:libmusicbrainz4:&sLoT4iSdEpReCaTeD:' \ |
139 |
+ -i configure.ac || die |
140 |
# /path/to/install: '/path/to/app-pda/gtkpod-2.1.2_beta2/image/usr/share/gtkpod/data/rhythmbox.gep’: File exists |
141 |
sed -i -e '/^dist_profiles_DATA/s:=.*:=:' plugins/sjcd/data/Makefile.am || die |
142 |
|
143 |
- sed -i -e 's:python:python2:' scripts/sync-palm-jppy.py || die |
144 |
- |
145 |
- epatch \ |
146 |
- "${FILESDIR}"/${P}-gdl-3.6.patch \ |
147 |
- "${FILESDIR}"/${P}-gold.patch |
148 |
- eautoreconf |
149 |
+ # m4dir for gst-element-check-0.10.m4 |
150 |
+ AT_M4DIR=${WORKDIR} eautoreconf |
151 |
} |
152 |
|
153 |
src_configure() { |