commit: aeded3688ae9bda56646423b6993965d128a17b0 Author: Tim Harder <radhermit <AT> gentoo <DOT> org> AuthorDate: Sat Mar 24 15:29:43 2018 +0000 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> CommitDate: Sat Mar 24 15:31:47 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeded368
media-gfx/fim: version bump to 0.5_rc3 Add graphics as another maintainer. Closes: https://bugs.gentoo.org/636656 media-gfx/fim/Manifest | 1 + media-gfx/fim/files/fim-0.5_rc3-jpeg.patch | 13 ++++ media-gfx/fim/files/fim-0.5_rc3-libsdl.patch | 27 +++++++ media-gfx/fim/fim-0.5_rc3.ebuild | 105 +++++++++++++++++++++++++++ media-gfx/fim/metadata.xml | 24 +++--- 5 files changed, 161 insertions(+), 9 deletions(-) diff --git a/media-gfx/fim/Manifest b/media-gfx/fim/Manifest index 01899175238..590f31a3f2c 100644 --- a/media-gfx/fim/Manifest +++ b/media-gfx/fim/Manifest @@ -1 +1,2 @@ DIST fim-0.4-rc3.tar.bz2 504681 BLAKE2B 6a161e5b278b980a4442300f1c7d90b5ab690f6379cb0f2e72d7b2b3478d1877f1c99f1f46f173f788390ea32d6185f13d570ea128d2f52ff351dff74c779737 SHA512 82a2b191c0cd26fb77b442df9ed104e51ae15f485390f07cf15a043725e6ee9b860ce903bf8355ad556adbbe076516a8807c0a6d937e89177e46c0068d5acabf +DIST fim-0.5-rc3.tar.bz2 564226 BLAKE2B 117e4a8644f1b7133f8a5337ce1a606017bee81180ff9a6fbd0c19d3056d2e670a84db20f2a0080ff5bf8e6e91108fdc952b77e4799f47968b38a108f145871e SHA512 946825e683a9020740b6e2115e44e4cd99b4d6bf59fde53d08d90666f00cdb8d98797d4e88b4513dd0e8d8fe5fbab3073cb1aae72117d129688050adf73da306 diff --git a/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch b/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch new file mode 100644 index 00000000000..1887196f7cb --- /dev/null +++ b/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch @@ -0,0 +1,13 @@ +https://svn.savannah.gnu.org/viewvc/fbi-improved/trunk/src/FbiStuffJpeg.cpp?r1=1041&r2=1076 + +--- trunk/src/FbiStuffJpeg.cpp ++++ trunk/src/FbiStuffJpeg.cpp +@@ -179,7 +179,7 @@ + + if(nsp) + /* std::cout << "|" << title << "|\n", */ +- nsp->setVariable(string("EXIF_") + title,value); ++ nsp->setVariable(string("EXIF_") + string(title),value); + } + + static void fim_ExifDataForeachContentFunc (ExifContent *content, void * user_data) diff --git a/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch b/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch new file mode 100644 index 00000000000..0f1e6beb6fe --- /dev/null +++ b/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch @@ -0,0 +1,27 @@ +https://svn.savannah.gnu.org/viewvc/fbi-improved/trunk/configure.ac?r1=1474&r2=1521 + +--- trunk/configure.ac ++++ trunk/configure.ac +@@ -1128,15 +1128,17 @@ + fim_handle_sdl='no' + fi + else +-dnl if test x$fim_cv_want_static == x1 ; then +- LIBSDL_CONFIG_FLAGS=--static-libs +-dnl else +-dnl LIBSDL_CONFIG_FLAGS=--libs +-dnl fi + AC_MSG_NOTICE([Activating LIBSDL.]) + fim_handle_sdl='yes' + LIBSDL_CXXFLAGS=`$LIBSDL_CONFIG --cflags` + CXXFLAGS="$CXXFLAGS $LIBSDL_CXXFLAGS" ++ LIBSDL_CONFIG_FLAGS=--static-libs ++ if $LIBSDL_CONFIG $LIBSDL_CONFIG_FLAGS ; then ++ LIBSDL_CONFIG_FLAGS=--static-libs ++ else ++ LIBSDL_CONFIG_FLAGS=--libs ++ fi ++ AC_MSG_NOTICE([Invoking $LIBSDL_CONFIG $LIBSDL_CONFIG_FLAGS.]) + LIBS="$LIBS `$LIBSDL_CONFIG $LIBSDL_CONFIG_FLAGS`" + # finish this ! + #FIM_LIB_OBJECTS="$FIM_LIB_OBJECTS SDLDevice.o" diff --git a/media-gfx/fim/fim-0.5_rc3.ebuild b/media-gfx/fim/fim-0.5_rc3.ebuild new file mode 100644 index 00000000000..1fc260ca524 --- /dev/null +++ b/media-gfx/fim/fim-0.5_rc3.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools + +DESCRIPTION="Fbi-IMproved is a framebuffer image viewer based on Fbi and inspired from Vim" +HOMEPAGE="https://savannah.nongnu.org/projects/fbi-improved"; +SRC_URI="http://download.savannah.gnu.org/releases/fbi-improved/${P/_rc/-rc}.tar.bz2"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="aalib bmp dia djvu exif fbcon gif graphicsmagick imagemagick jpeg jpeg2k pcx pdf png postscript readline sdl static svg tiff xfig" + +RDEPEND="media-fonts/terminus-font + aalib? ( media-libs/aalib[slang] ) + dia? ( app-office/dia ) + djvu? ( app-text/djvu ) + exif? ( media-libs/libexif ) + gif? ( media-libs/giflib ) + graphicsmagick? ( media-gfx/graphicsmagick ) + imagemagick? ( virtual/imagemagick-tools ) + jpeg? ( virtual/jpeg:0 ) + jpeg2k? ( media-libs/jasper:= ) + pdf? ( >=app-text/poppler-0.31 ) + png? ( media-libs/libpng:0= ) + postscript? ( app-text/libspectre ) + readline? ( sys-libs/readline:0= ) + sdl? ( media-libs/libsdl ) + svg? ( media-gfx/inkscape ) + tiff? ( media-libs/tiff:0 ) + xfig? ( media-gfx/xfig )" +DEPEND="${RDEPEND} + sys-devel/bison + sys-devel/flex" + +S=${WORKDIR}/${P/_rc/-rc} + +PATCHES=( + "${FILESDIR}/${PN}-0.4_rc3-poppler031.patch" + "${FILESDIR}/${PN}-0.5_rc3-jpeg.patch" + "${FILESDIR}/${PN}-0.5_rc3-libsdl.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable aalib aa) \ + $(use_enable bmp) \ + $(use_enable dia) \ + $(use_enable djvu) \ + $(use_enable exif) \ + $(use_enable fbcon framebuffer) \ + $(use_enable gif) \ + $(use_enable graphicsmagick) \ + $(use_enable imagemagick convert) \ + $(use_enable jpeg) \ + $(use_enable jpeg2k jasper) \ + $(use_enable pcx) \ + $(use_enable pdf poppler) \ + $(use_enable png) \ + $(use_enable postscript ps) \ + $(use_enable readline) \ + $(use_enable sdl) \ + $(use_enable static) \ + $(use_enable svg inkscape) \ + $(use_enable tiff) \ + $(use_enable xfig) \ + --disable-hardcoded-font \ + --disable-imlib2 \ + --disable-matrices-rendering \ + --disable-xcftopnm \ + --enable-fimrc \ + --enable-history \ + --enable-loader-string-specification \ + --enable-mark-and-dump \ + --enable-output-console \ + --enable-raw-bits-rendering \ + --enable-read-dirs \ + --enable-recursive-dirs \ + --enable-resize-optimizations \ + --enable-scan-consolefonts \ + --enable-screen \ + --enable-scripting \ + --enable-seek-magic \ + --enable-stdin-image-reading \ + --enable-unicode \ + --enable-warnings \ + --enable-windows \ + --with-default-consolefont=/usr/share/consolefonts/ter-114n.psf.gz +} + +src_compile() { + emake -j1 +} + +src_install() { + emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install +} diff --git a/media-gfx/fim/metadata.xml b/media-gfx/fim/metadata.xml index 6b3d433fbf2..e6946010490 100644 --- a/media-gfx/fim/metadata.xml +++ b/media-gfx/fim/metadata.xml @@ -1,13 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<maintainer type="person"> -<email>[email protected]</email> -<name>Michael Weber</name> -</maintainer> -<use> - <flag name="dia">Enable DIA file support via app-office/dia</flag> - <flag name="imagemagick">Use convert from media-gfx/imagemagick as fallback file opener</flag> - <flag name="xfig">Enable FIG file support via media-gfx/xfig</flag> -</use> + <maintainer type="person"> + <email>[email protected]</email> + <name>Michael Weber</name> + </maintainer> + <maintainer type="project"> + <email>[email protected]</email> + <name>Gentoo Graphics Project</name> + </maintainer> + <use> + <flag name="bmp">Enable BMP file support</flag> + <flag name="dia">Enable DIA file support via app-office/dia</flag> + <flag name="imagemagick">Use convert from media-gfx/imagemagick as fallback file opener</flag> + <flag name="pcx">Enable PCX file support</flag> + <flag name="xfig">Enable FIG file support via media-gfx/xfig</flag> + </use> </pkgmetadata>
