| 1 |
billie 13/11/30 14:47:03 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: mjpegtools-2.1.0-r1.ebuild |
| 5 |
Log: |
| 6 |
Disable -fno_PIC. This fixes bug #267829. Thanks to a_tevelev for the report. |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 215AD14D) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.200 media-video/mjpegtools/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mjpegtools/ChangeLog?rev=1.200&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mjpegtools/ChangeLog?rev=1.200&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mjpegtools/ChangeLog?r1=1.199&r2=1.200 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v |
| 20 |
retrieving revision 1.199 |
| 21 |
retrieving revision 1.200 |
| 22 |
diff -u -r1.199 -r1.200 |
| 23 |
--- ChangeLog 18 Nov 2013 10:57:03 -0000 1.199 |
| 24 |
+++ ChangeLog 30 Nov 2013 14:47:02 -0000 1.200 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for media-video/mjpegtools |
| 27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.199 2013/11/18 10:57:03 chainsaw Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.200 2013/11/30 14:47:02 billie Exp $ |
| 30 |
+ |
| 31 |
+*mjpegtools-2.1.0-r1 (30 Nov 2013) |
| 32 |
+ |
| 33 |
+ 30 Nov 2013; Daniel Pielmeier <billie@g.o> |
| 34 |
+ +mjpegtools-2.1.0-r1.ebuild, +files/mjpegtools-2.1.0-pic.patch: |
| 35 |
+ Disable -fno_PIC. This fixes bug #267829. Thanks to a_tevelev for the report. |
| 36 |
|
| 37 |
18 Nov 2013; Tony Vroon <chainsaw@g.o> mjpegtools-2.1.0.ebuild: |
| 38 |
Marked stable on AMD64 based on arch testing by Elijah "Armageddon" El |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 media-video/mjpegtools/mjpegtools-2.1.0-r1.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mjpegtools/mjpegtools-2.1.0-r1.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mjpegtools/mjpegtools-2.1.0-r1.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: mjpegtools-2.1.0-r1.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2013 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.1.0-r1.ebuild,v 1.1 2013/11/30 14:47:03 billie Exp $ |
| 52 |
|
| 53 |
EAPI=5 |
| 54 |
|
| 55 |
inherit autotools eutils flag-o-matic toolchain-funcs |
| 56 |
|
| 57 |
DESCRIPTION="Tools for MJPEG video" |
| 58 |
HOMEPAGE="http://mjpeg.sourceforge.net/" |
| 59 |
SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz" |
| 60 |
|
| 61 |
LICENSE="GPL-2" |
| 62 |
SLOT="1" |
| 63 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" |
| 64 |
IUSE="dga dv gtk mmx png quicktime sdl sdlgfx static-libs v4l" |
| 65 |
REQUIRED_USE="sdlgfx? ( sdl )" |
| 66 |
|
| 67 |
RDEPEND="virtual/jpeg |
| 68 |
quicktime? ( media-libs/libquicktime ) |
| 69 |
dv? ( >=media-libs/libdv-0.99 ) |
| 70 |
png? ( media-libs/libpng:0= ) |
| 71 |
dga? ( x11-libs/libXxf86dga ) |
| 72 |
gtk? ( x11-libs/gtk+:2 ) |
| 73 |
sdl? ( >=media-libs/libsdl-1.2.7-r3 |
| 74 |
x11-libs/libX11 |
| 75 |
x11-libs/libXt |
| 76 |
sdlgfx? ( media-libs/sdl-gfx ) |
| 77 |
)" |
| 78 |
|
| 79 |
DEPEND="${RDEPEND} |
| 80 |
mmx? ( dev-lang/nasm ) |
| 81 |
>=sys-apps/sed-4 |
| 82 |
virtual/awk |
| 83 |
virtual/pkgconfig" |
| 84 |
|
| 85 |
pkg_pretend() { |
| 86 |
if has_version ">=sys-kernel/linux-headers-2.6.38" && use v4l; then |
| 87 |
ewarn "Current versions of mjpegtools only support V4L1 which is not available" |
| 88 |
ewarn "for kernel versions 2.6.38 and above. V4L1 will be disabled." |
| 89 |
fi |
| 90 |
} |
| 91 |
|
| 92 |
src_prepare() { |
| 93 |
epatch "${FILESDIR}"/${P}-pic.patch |
| 94 |
eautoreconf |
| 95 |
sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure |
| 96 |
} |
| 97 |
|
| 98 |
src_configure() { |
| 99 |
[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2 |
| 100 |
|
| 101 |
econf \ |
| 102 |
--enable-compile-warnings \ |
| 103 |
$(use_enable mmx simd-accel) \ |
| 104 |
$(use_enable static-libs static) \ |
| 105 |
--enable-largefile \ |
| 106 |
$(use_with quicktime libquicktime) \ |
| 107 |
$(use_with dv libdv) \ |
| 108 |
$(use_with png libpng) \ |
| 109 |
$(use_with dga) \ |
| 110 |
$(use_with gtk) \ |
| 111 |
$(use_with sdl libsdl) \ |
| 112 |
$(use_with sdlgfx) \ |
| 113 |
$(use_with v4l) \ |
| 114 |
$(use_with sdl x) |
| 115 |
} |
| 116 |
|
| 117 |
src_install() { |
| 118 |
default |
| 119 |
|
| 120 |
dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt |
| 121 |
|
| 122 |
find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed" |
| 123 |
} |
| 124 |
|
| 125 |
pkg_postinst() { |
| 126 |
if [[ -z "${REPLACING_VERSIONS}" ]]; then |
| 127 |
elog "mjpegtools installs user contributed scripts which require additional" |
| 128 |
elog "dependencies not pulled in by the installation." |
| 129 |
elog "These have to be installed manually." |
| 130 |
elog "Currently known extra dpendencies are: ffmpeg, mencoder from mplayer," |
| 131 |
elog "parts of transcode, mpeg2dec from libmpeg2, sox, toolame, vcdimager, python." |
| 132 |
fi |
| 133 |
} |
Archives