reinit the tree, so we can have metadata

6 files changed, 251 insertions, 0 deletions

diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
new file mode 100644
index 000000000000..257f6c5160cd
--- /dev/null
+++ b/media-libs/libextractor/Manifest
@@ -0,0 +1,8 @@
+AUX libextractor-1.3-exiv2-0.26.patch 607 SHA256 b72ddf4eeb31c275ffe682f947fb51c31ea9b9b7e7871f3906bbdd7b10db303b SHA512 4f782dc427ad5c54b2bf362acdba84741c07e8e4a3691be80939e008d2727c54c4509b853c070ad9581afbe94ddd0bf65bbb685d74ea4956c5bbbf03820aa431 WHIRLPOOL 15837bd932aa95e1598dc7a4b98b73778dcc8f5459a8c4f0317047fc547629dc07f8e89da100c157c72df2e0ded39ebb02d4ff50b5b39b3d45fc9a391993c516
+AUX libextractor-1.3-ffmpeg-2.9.patch 1884 SHA256 2334516b13e64b798c79c2531478fa590f291bf05a26fd2648271e3ca7a41b2a SHA512 219d155bae9e4d8ab868373309e5642a3ae3dad2d0f5afce689a9ec46d6d2fe57966319e454e86af96b473add7f01b3e55115121dae7a703f10df18f6d85f00b WHIRLPOOL 9221b640a83e61d48e6fa46e3276be35cce66ad415f872adaa511086ceccc919dbaffc3e83fe88a0703d04beb2e5b8b5223fa939790428932b0ac26d32ec5af1
+AUX libextractor-1.3-giflib-5.patch 1139 SHA256 ea0201c60e8bea4677de5de8f75c6672f3293e8585d5a32fbfbf3e67133c102a SHA512 4aaed95a427ebcff58433673e5469061a87a1eb11665896660150d863ef52c0c5c657e5ab8a07d4475861f3b53f8772d3b72ecd7401d8f2eb11174b6255e12d7 WHIRLPOOL 4da6891bbbdf6d8d30d95dcc0676b2b25e1b7af4814f7582f7dd7a4f64f68bd8d021a038c9b6591793a91f9f905bc8e9f60b608748e84dac03b6472206327833
+DIST libextractor-1.3.tar.gz 7942021 SHA256 868ad64c9a056d6b923d451d746935bffb1ddf5d89c3eb4f67d786001a3f7b7f SHA512 38ed47e5e5f50ddf216408f698a104900baa3b03cc8a81a14e63afd30b3e3922acda17363d88d9ba1356ebf70287c8a5152ff6933a36ec1042ca0d832218d45d WHIRLPOOL aeb8305d9efbe6e52632bb7281ea6df26c417c8bbe1398fdc0106653e3b4109095ea734c84f92ede03bd6406c69b362ee4590a0c964c550d8878f890b32b52d9
+EBUILD libextractor-1.3-r1.ebuild 2891 SHA256 9d243dfec5c50e0a3dcd24f443263aab9d064037d29fba0a552357840afe82b0 SHA512 be168b3a46046e3a3186f29523ab82de17e350a77ab4cfb01c70ba4cb89c1fcc13495ad6afbe1e6d6ed43d8c94d4ee9f61f575a2298650f983f76673430e0183 WHIRLPOOL 0ce59a8bd48216d5faacf7f7c6b4add053e6db40ab2d8476c12c91ff3c6db94e205f078c027a8a35fa6d89b4fc0062f8dbc1c9fe1d55adb4e5440c6232004181
+MISC ChangeLog 4191 SHA256 7921edd04a67c78f4eebd61532b56d6b2f7ad8c73e35987b2d5da6dbde40fc3b SHA512 8a05915d53941b45bc1de5d7f352c8425fbe2c61ef6669c636b2b8ae3f0e12c5754ad1fd081686c40f25041ddf8513558300dbf71610c7281ae0623470bd64f1 WHIRLPOOL 70b1d73c6b86b8a08566cc80997658c3061eeaa669d3a2163929f18f74beecc5a6ca2ad74ed675e9f52133e5715f6059cc8f70fe97cfbed8f114de14696517ce
+MISC ChangeLog-2015 16007 SHA256 7a052a72c78cb8fa8cf63a1531d5ea7a7b927568e4436928de80f073da9ff0ff SHA512 c90bdd96fc6f451b8149523c1b0b1b4ecb31ca3d01f943cf6be70c43e8a731e44c95f26b3e6c718101977bce84ec17b579dd1a7c59bda2a5568ad6b11339f4b5 WHIRLPOOL ba559da2dec27cf9ed639b8992d42bac8b68996deaf0f44c98165b425c768a9b75f2fb419b3cae127ec6542b3630243e6efcb7b930dead7e5a39b3cc5556782e
+MISC metadata.xml 520 SHA256 3c50055e84f9b4041fe4874b6f7d06c8f70d8c692fba72c0b84ea05fe044aa31 SHA512 6de14a41b912e26fd01d4e468ae5de4893c054d43ad90891a92aa7dc267498d754607251210f3b6ddd4e7b4e739478494ec827a0717a4ebaa5313e83d7fa17ff WHIRLPOOL bff2b6d7ca814eeafaa8ccfda5e901f6d1030186c09dc59034fff19aec60c4c1ec570f10cb600627ae4e89f90d776edfb7600ed01a894db0e441a976783e3d44
diff --git a/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch b/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch
new file mode 100644
index 000000000000..b6e0b41773b3
--- /dev/null
+++ b/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch
@@ -0,0 +1,27 @@
+--- a/src/plugins/exiv2_extractor.cc	2013-06-25 13:02:05.000000000 +0200
++++ b/src/plugins/exiv2_extractor.cc	2017-06-10 14:22:57.000000000 +0200
+@@ -180,7 +180,11 @@
+    *
+    * @return -1 on error
+    */
++#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
++  virtual size_t size (void) const;
++#else
+   virtual long int size (void) const;
++#endif
+ 
+   /**
+    * Check if file is open.
+@@ -445,7 +449,11 @@
+  *
+  * @return -1 on error
+  */
+-long int 
++#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
++size_t
++#else
++long int
++#endif
+ ExtractorIO::size (void) const
+ {
+   return (long) ec->get_size (ec->cls);
diff --git a/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch b/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch
new file mode 100644
index 000000000000..d9e50b698ac8
--- /dev/null
+++ b/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch
@@ -0,0 +1,52 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
+Last-Update: <2015-11-28>
+
+--- libextractor-1.3.orig/src/plugins/thumbnailffmpeg_extractor.c
++++ libextractor-1.3/src/plugins/thumbnailffmpeg_extractor.c
+@@ -153,7 +153,7 @@ seek_cb (void *opaque,
+ static size_t 
+ create_thumbnail (int src_width, int src_height, 
+ 		  int src_stride[],
+-		  enum PixelFormat src_pixfmt, 
++		  enum AVPixelFormat src_pixfmt,
+ 		  const uint8_t * const src_data[],
+ 		  int dst_width, int dst_height,
+ 		  uint8_t **output_data, 
+@@ -189,7 +189,7 @@ create_thumbnail (int src_width, int src
+   if (NULL == 
+       (scaler_ctx =
+        sws_getContext (src_width, src_height, src_pixfmt,
+-		       dst_width, dst_height, PIX_FMT_RGB24, 
++		       dst_width, dst_height, AV_PIX_FMT_RGB24,
+ 		       SWS_BILINEAR, NULL, NULL, NULL)))
+     {
+ #if DEBUG
+@@ -214,7 +214,7 @@ create_thumbnail (int src_width, int src
+       return 0;
+     }
+   if (NULL == (dst_buffer =
+-	       av_malloc (avpicture_get_size (PIX_FMT_RGB24, dst_width, dst_height))))
++	       av_malloc (avpicture_get_size (AV_PIX_FMT_RGB24, dst_width, dst_height))))
+     {
+ #if DEBUG
+       fprintf (stderr,
+@@ -229,7 +229,7 @@ create_thumbnail (int src_width, int src
+       return 0;
+     }
+   avpicture_fill ((AVPicture *) dst_frame, dst_buffer,
+-                  PIX_FMT_RGB24, dst_width, dst_height);
++                  AV_PIX_FMT_RGB24, dst_width, dst_height);
+   sws_scale (scaler_ctx,
+              src_data, 
+              src_stride,
+@@ -272,7 +272,7 @@ create_thumbnail (int src_width, int src
+     }
+   encoder_codec_ctx->width = dst_width;
+   encoder_codec_ctx->height = dst_height;
+-  encoder_codec_ctx->pix_fmt = PIX_FMT_RGB24;
++  encoder_codec_ctx->pix_fmt = AV_PIX_FMT_RGB24;
+   opts = NULL;
+   if (avcodec_open2 (encoder_codec_ctx, encoder_codec, &opts) < 0)
+     {
+
diff --git a/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch b/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch
new file mode 100644
index 000000000000..4893f9784a58
--- /dev/null
+++ b/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/571902
+
+------------------------------------------------------------------------
+r34095 | LRN | 2014-07-31 10:58:51 -0400 (Thu, 31 Jul 2014) | 1 line
+
+Add giflib-5.1.0 compatibility
+
+Index: src/plugins/gif_extractor.c
+===================================================================
+--- a/src/plugins/gif_extractor.c	(revision 34094)
++++ b/src/plugins/gif_extractor.c	(revision 34095)
+@@ -78,7 +78,11 @@ EXTRACTOR_gif_extract_method (struct EXT
+   if (gif_file == NULL || gif_error != 0)
+   {
+     if (gif_file != NULL)
++#if GIFLIB_MAJOR < 5 || GIFLIB_MINOR < 1
+       EGifCloseFile (gif_file);
++#else
++      EGifCloseFile (gif_file, NULL);
++#endif
+     return; /* not a GIF */
+   }
+ #endif
+@@ -133,7 +137,11 @@ EXTRACTOR_gif_extract_method (struct EXT
+ 	       DGifGetExtensionNext(gif_file, &ext)) &&
+ 	      (NULL != ext) ) ; /* keep going */
+     }
++#if defined (GIF_LIB_VERSION) || GIFLIB_MAJOR < 5 || GIFLIB_MINOR < 1
+   DGifCloseFile (gif_file);
++#else
++  DGifCloseFile (gif_file, NULL);
++#endif
+ }
+ 
+ /* end of gif_extractor.c */
+
+------------------------------------------------------------------------
diff --git a/media-libs/libextractor/libextractor-1.3-r1.ebuild b/media-libs/libextractor/libextractor-1.3-r1.ebuild
new file mode 100644
index 000000000000..dc06475abc4f
--- /dev/null
+++ b/media-libs/libextractor/libextractor-1.3-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Library to extract metadata from files of arbitrary type"
+HOMEPAGE="https://www.gnu.org/software/libextractor/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
+IUSE="+archive +bzip2 ffmpeg flac gif gsf gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib" # test
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2
+	media-gfx/exiv2:=
+	sys-devel/libtool
+	virtual/libiconv
+	virtual/libintl
+	archive? ( app-arch/libarchive:= )
+	bzip2? ( app-arch/bzip2 )
+	ffmpeg? ( virtual/ffmpeg )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	gif? ( media-libs/giflib:= )
+	gsf? ( gnome-extra/libgsf:= )
+	gtk? ( x11-libs/gtk+:3 )
+	jpeg? ( virtual/jpeg:0 )
+	magic? ( sys-apps/file )
+	midi? ( media-libs/libsmf )
+	mp4? ( media-libs/libmp4v2:0 )
+	mpeg? ( media-libs/libmpeg2 )
+	tidy? ( app-text/htmltidy )
+	tiff? ( media-libs/tiff:0 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+# test? ( app-forensics/zzuf )
+RDEPEND="${COMMON_DEPEND}
+	!sci-biology/glimmer
+	!sci-chemistry/pdb-extract
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-giflib-5.patch #571902
+	"${FILESDIR}"/${P}-ffmpeg-2.9.patch
+	"${FILESDIR}"/${P}-exiv2-0.26.patch #621242
+)
+
+src_prepare() {
+	default
+
+	# m4/ax_create_pkgconfig_info.m4 is passing environment LDFLAGS to Libs:
+	sed -i \
+		-e '/^ax_create_pkgconfig_ldflags=/s:$LDFLAGS ::' \
+		-e 's:tidy/tidy.h:tidy.h:' \
+		-e 's:tidy/buffio.h:buffio.h:' \
+		configure src/plugins/html_extractor.c || die
+
+	if ! use tidy; then
+		sed -i -e 's:tidy.h:dIsAbLe&:' configure || die
+	fi
+}
+
+src_configure() {
+	e_ac_cv() {
+		export ac_cv_"$@"
+	}
+
+	e_ac_cv {lib_rpm_rpmReadPackageFile,prog_HAVE_ZZUF}=no
+
+	e_ac_cv header_FLAC_all_h=$(usex flac)
+	e_ac_cv lib_FLAC_FLAC__stream_decoder_init_stream=$(usex flac)
+	e_ac_cv lib_FLAC_FLAC__stream_decoder_init_ogg_stream=$(usex flac)
+
+	e_ac_cv header_archive_h=$(usex archive)
+	e_ac_cv header_bzlib_h=$(usex bzip2)
+	e_ac_cv header_gif_lib_h=$(usex gif)
+	e_ac_cv header_jpeglib_h=$(usex jpeg)
+	e_ac_cv header_magic_h=$(usex magic)
+	e_ac_cv header_mpeg2dec_mpeg2_h=$(usex mpeg)
+	e_ac_cv header_tiffio_h=$(usex tiff)
+	e_ac_cv header_vorbis_vorbisfile_h=$(usex vorbis)
+	e_ac_cv header_zlib_h=$(usex zlib)
+	e_ac_cv lib_mp4v2_MP4ReadProvider=$(usex mp4)
+	e_ac_cv lib_smf_smf_load_from_memory=$(usex midi)
+
+	# gstreamer support is for 1.0, no 0.10 support
+	econf \
+		--disable-static \
+		--enable-experimental \
+		--enable-glib \
+		--with-gtk_version=$(usex gtk 3.0.0 false) \
+		--without-gstreamer \
+		--disable-gsf-gnome \
+		$(use_enable gsf) \
+		$(use_enable ffmpeg)
+}
+
+src_install() {
+	default
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libextractor/metadata.xml b/media-libs/libextractor/metadata.xml
new file mode 100644
index 000000000000..7df945748e38
--- /dev/null
+++ b/media-libs/libextractor/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <use>
+    <flag name="archive">Enable archive support using <pkg>app-arch/libarchive</pkg></flag>
+    <flag name="gsf">Enable OLE2 (MS Office) plug-in support using <pkg>gnome-extra/libgsf</pkg></flag>
+    <flag name="magic">Enable magic support using <pkg>sys-apps/file</pkg></flag>
+    <flag name="midi">Enable MIDI support through <pkg>media-libs/libsmf</pkg></flag>
+  </use>
+</pkgmetadata>