1 |
commit: aeded3688ae9bda56646423b6993965d128a17b0 |
2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 24 15:29:43 2018 +0000 |
4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 24 15:31:47 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeded368 |
7 |
|
8 |
media-gfx/fim: version bump to 0.5_rc3 |
9 |
|
10 |
Add graphics as another maintainer. |
11 |
|
12 |
Closes: https://bugs.gentoo.org/636656 |
13 |
|
14 |
media-gfx/fim/Manifest | 1 + |
15 |
media-gfx/fim/files/fim-0.5_rc3-jpeg.patch | 13 ++++ |
16 |
media-gfx/fim/files/fim-0.5_rc3-libsdl.patch | 27 +++++++ |
17 |
media-gfx/fim/fim-0.5_rc3.ebuild | 105 +++++++++++++++++++++++++++ |
18 |
media-gfx/fim/metadata.xml | 24 +++--- |
19 |
5 files changed, 161 insertions(+), 9 deletions(-) |
20 |
|
21 |
diff --git a/media-gfx/fim/Manifest b/media-gfx/fim/Manifest |
22 |
index 01899175238..590f31a3f2c 100644 |
23 |
--- a/media-gfx/fim/Manifest |
24 |
+++ b/media-gfx/fim/Manifest |
25 |
@@ -1 +1,2 @@ |
26 |
DIST fim-0.4-rc3.tar.bz2 504681 BLAKE2B 6a161e5b278b980a4442300f1c7d90b5ab690f6379cb0f2e72d7b2b3478d1877f1c99f1f46f173f788390ea32d6185f13d570ea128d2f52ff351dff74c779737 SHA512 82a2b191c0cd26fb77b442df9ed104e51ae15f485390f07cf15a043725e6ee9b860ce903bf8355ad556adbbe076516a8807c0a6d937e89177e46c0068d5acabf |
27 |
+DIST fim-0.5-rc3.tar.bz2 564226 BLAKE2B 117e4a8644f1b7133f8a5337ce1a606017bee81180ff9a6fbd0c19d3056d2e670a84db20f2a0080ff5bf8e6e91108fdc952b77e4799f47968b38a108f145871e SHA512 946825e683a9020740b6e2115e44e4cd99b4d6bf59fde53d08d90666f00cdb8d98797d4e88b4513dd0e8d8fe5fbab3073cb1aae72117d129688050adf73da306 |
28 |
|
29 |
diff --git a/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch b/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch |
30 |
new file mode 100644 |
31 |
index 00000000000..1887196f7cb |
32 |
--- /dev/null |
33 |
+++ b/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch |
34 |
@@ -0,0 +1,13 @@ |
35 |
+https://svn.savannah.gnu.org/viewvc/fbi-improved/trunk/src/FbiStuffJpeg.cpp?r1=1041&r2=1076 |
36 |
+ |
37 |
+--- trunk/src/FbiStuffJpeg.cpp |
38 |
++++ trunk/src/FbiStuffJpeg.cpp |
39 |
+@@ -179,7 +179,7 @@ |
40 |
+ |
41 |
+ if(nsp) |
42 |
+ /* std::cout << "|" << title << "|\n", */ |
43 |
+- nsp->setVariable(string("EXIF_") + title,value); |
44 |
++ nsp->setVariable(string("EXIF_") + string(title),value); |
45 |
+ } |
46 |
+ |
47 |
+ static void fim_ExifDataForeachContentFunc (ExifContent *content, void * user_data) |
48 |
|
49 |
diff --git a/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch b/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch |
50 |
new file mode 100644 |
51 |
index 00000000000..0f1e6beb6fe |
52 |
--- /dev/null |
53 |
+++ b/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch |
54 |
@@ -0,0 +1,27 @@ |
55 |
+https://svn.savannah.gnu.org/viewvc/fbi-improved/trunk/configure.ac?r1=1474&r2=1521 |
56 |
+ |
57 |
+--- trunk/configure.ac |
58 |
++++ trunk/configure.ac |
59 |
+@@ -1128,15 +1128,17 @@ |
60 |
+ fim_handle_sdl='no' |
61 |
+ fi |
62 |
+ else |
63 |
+-dnl if test x$fim_cv_want_static == x1 ; then |
64 |
+- LIBSDL_CONFIG_FLAGS=--static-libs |
65 |
+-dnl else |
66 |
+-dnl LIBSDL_CONFIG_FLAGS=--libs |
67 |
+-dnl fi |
68 |
+ AC_MSG_NOTICE([Activating LIBSDL.]) |
69 |
+ fim_handle_sdl='yes' |
70 |
+ LIBSDL_CXXFLAGS=`$LIBSDL_CONFIG --cflags` |
71 |
+ CXXFLAGS="$CXXFLAGS $LIBSDL_CXXFLAGS" |
72 |
++ LIBSDL_CONFIG_FLAGS=--static-libs |
73 |
++ if $LIBSDL_CONFIG $LIBSDL_CONFIG_FLAGS ; then |
74 |
++ LIBSDL_CONFIG_FLAGS=--static-libs |
75 |
++ else |
76 |
++ LIBSDL_CONFIG_FLAGS=--libs |
77 |
++ fi |
78 |
++ AC_MSG_NOTICE([Invoking $LIBSDL_CONFIG $LIBSDL_CONFIG_FLAGS.]) |
79 |
+ LIBS="$LIBS `$LIBSDL_CONFIG $LIBSDL_CONFIG_FLAGS`" |
80 |
+ # finish this ! |
81 |
+ #FIM_LIB_OBJECTS="$FIM_LIB_OBJECTS SDLDevice.o" |
82 |
|
83 |
diff --git a/media-gfx/fim/fim-0.5_rc3.ebuild b/media-gfx/fim/fim-0.5_rc3.ebuild |
84 |
new file mode 100644 |
85 |
index 00000000000..1fc260ca524 |
86 |
--- /dev/null |
87 |
+++ b/media-gfx/fim/fim-0.5_rc3.ebuild |
88 |
@@ -0,0 +1,105 @@ |
89 |
+# Copyright 1999-2018 Gentoo Foundation |
90 |
+# Distributed under the terms of the GNU General Public License v2 |
91 |
+ |
92 |
+EAPI=6 |
93 |
+ |
94 |
+inherit autotools |
95 |
+ |
96 |
+DESCRIPTION="Fbi-IMproved is a framebuffer image viewer based on Fbi and inspired from Vim" |
97 |
+HOMEPAGE="https://savannah.nongnu.org/projects/fbi-improved" |
98 |
+SRC_URI="http://download.savannah.gnu.org/releases/fbi-improved/${P/_rc/-rc}.tar.bz2" |
99 |
+ |
100 |
+LICENSE="GPL-2" |
101 |
+SLOT="0" |
102 |
+KEYWORDS="~amd64 ~arm ~x86" |
103 |
+IUSE="aalib bmp dia djvu exif fbcon gif graphicsmagick imagemagick jpeg jpeg2k pcx pdf png postscript readline sdl static svg tiff xfig" |
104 |
+ |
105 |
+RDEPEND="media-fonts/terminus-font |
106 |
+ aalib? ( media-libs/aalib[slang] ) |
107 |
+ dia? ( app-office/dia ) |
108 |
+ djvu? ( app-text/djvu ) |
109 |
+ exif? ( media-libs/libexif ) |
110 |
+ gif? ( media-libs/giflib ) |
111 |
+ graphicsmagick? ( media-gfx/graphicsmagick ) |
112 |
+ imagemagick? ( virtual/imagemagick-tools ) |
113 |
+ jpeg? ( virtual/jpeg:0 ) |
114 |
+ jpeg2k? ( media-libs/jasper:= ) |
115 |
+ pdf? ( >=app-text/poppler-0.31 ) |
116 |
+ png? ( media-libs/libpng:0= ) |
117 |
+ postscript? ( app-text/libspectre ) |
118 |
+ readline? ( sys-libs/readline:0= ) |
119 |
+ sdl? ( media-libs/libsdl ) |
120 |
+ svg? ( media-gfx/inkscape ) |
121 |
+ tiff? ( media-libs/tiff:0 ) |
122 |
+ xfig? ( media-gfx/xfig )" |
123 |
+DEPEND="${RDEPEND} |
124 |
+ sys-devel/bison |
125 |
+ sys-devel/flex" |
126 |
+ |
127 |
+S=${WORKDIR}/${P/_rc/-rc} |
128 |
+ |
129 |
+PATCHES=( |
130 |
+ "${FILESDIR}/${PN}-0.4_rc3-poppler031.patch" |
131 |
+ "${FILESDIR}/${PN}-0.5_rc3-jpeg.patch" |
132 |
+ "${FILESDIR}/${PN}-0.5_rc3-libsdl.patch" |
133 |
+) |
134 |
+ |
135 |
+src_prepare() { |
136 |
+ default |
137 |
+ eautoreconf |
138 |
+} |
139 |
+ |
140 |
+src_configure() { |
141 |
+ econf \ |
142 |
+ $(use_enable aalib aa) \ |
143 |
+ $(use_enable bmp) \ |
144 |
+ $(use_enable dia) \ |
145 |
+ $(use_enable djvu) \ |
146 |
+ $(use_enable exif) \ |
147 |
+ $(use_enable fbcon framebuffer) \ |
148 |
+ $(use_enable gif) \ |
149 |
+ $(use_enable graphicsmagick) \ |
150 |
+ $(use_enable imagemagick convert) \ |
151 |
+ $(use_enable jpeg) \ |
152 |
+ $(use_enable jpeg2k jasper) \ |
153 |
+ $(use_enable pcx) \ |
154 |
+ $(use_enable pdf poppler) \ |
155 |
+ $(use_enable png) \ |
156 |
+ $(use_enable postscript ps) \ |
157 |
+ $(use_enable readline) \ |
158 |
+ $(use_enable sdl) \ |
159 |
+ $(use_enable static) \ |
160 |
+ $(use_enable svg inkscape) \ |
161 |
+ $(use_enable tiff) \ |
162 |
+ $(use_enable xfig) \ |
163 |
+ --disable-hardcoded-font \ |
164 |
+ --disable-imlib2 \ |
165 |
+ --disable-matrices-rendering \ |
166 |
+ --disable-xcftopnm \ |
167 |
+ --enable-fimrc \ |
168 |
+ --enable-history \ |
169 |
+ --enable-loader-string-specification \ |
170 |
+ --enable-mark-and-dump \ |
171 |
+ --enable-output-console \ |
172 |
+ --enable-raw-bits-rendering \ |
173 |
+ --enable-read-dirs \ |
174 |
+ --enable-recursive-dirs \ |
175 |
+ --enable-resize-optimizations \ |
176 |
+ --enable-scan-consolefonts \ |
177 |
+ --enable-screen \ |
178 |
+ --enable-scripting \ |
179 |
+ --enable-seek-magic \ |
180 |
+ --enable-stdin-image-reading \ |
181 |
+ --enable-unicode \ |
182 |
+ --enable-warnings \ |
183 |
+ --enable-windows \ |
184 |
+ --with-default-consolefont=/usr/share/consolefonts/ter-114n.psf.gz |
185 |
+} |
186 |
+ |
187 |
+src_compile() { |
188 |
+ emake -j1 |
189 |
+} |
190 |
+ |
191 |
+src_install() { |
192 |
+ emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install |
193 |
+} |
194 |
|
195 |
diff --git a/media-gfx/fim/metadata.xml b/media-gfx/fim/metadata.xml |
196 |
index 6b3d433fbf2..e6946010490 100644 |
197 |
--- a/media-gfx/fim/metadata.xml |
198 |
+++ b/media-gfx/fim/metadata.xml |
199 |
@@ -1,13 +1,19 @@ |
200 |
<?xml version="1.0" encoding="UTF-8"?> |
201 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
202 |
<pkgmetadata> |
203 |
-<maintainer type="person"> |
204 |
-<email>xmw@g.o</email> |
205 |
-<name>Michael Weber</name> |
206 |
-</maintainer> |
207 |
-<use> |
208 |
- <flag name="dia">Enable DIA file support via app-office/dia</flag> |
209 |
- <flag name="imagemagick">Use convert from media-gfx/imagemagick as fallback file opener</flag> |
210 |
- <flag name="xfig">Enable FIG file support via media-gfx/xfig</flag> |
211 |
-</use> |
212 |
+ <maintainer type="person"> |
213 |
+ <email>xmw@g.o</email> |
214 |
+ <name>Michael Weber</name> |
215 |
+ </maintainer> |
216 |
+ <maintainer type="project"> |
217 |
+ <email>graphics@g.o</email> |
218 |
+ <name>Gentoo Graphics Project</name> |
219 |
+ </maintainer> |
220 |
+ <use> |
221 |
+ <flag name="bmp">Enable BMP file support</flag> |
222 |
+ <flag name="dia">Enable DIA file support via app-office/dia</flag> |
223 |
+ <flag name="imagemagick">Use convert from media-gfx/imagemagick as fallback file opener</flag> |
224 |
+ <flag name="pcx">Enable PCX file support</flag> |
225 |
+ <flag name="xfig">Enable FIG file support via media-gfx/xfig</flag> |
226 |
+ </use> |
227 |
</pkgmetadata> |