diff options
| author |   Heinrich Wendel <lanius@gentoo.org> | 2004-09-25 14:57:16 +0000 |
|---|---|---|
| committer | Heinrich Wendel <lanius@gentoo.org> | 2004-09-25 14:57:16 +0000 |
| commit | a63671a3ec4d6d6a023f527b792601ed0ad19579 (patch) | |
| tree | 85756a53f0f891fed8898efd4b5852cf8df90d31 /media-video | |
| parent | Removed 4.4.5, no longer available from upstream. Closes #65269. (Manifest re... (diff) | |
| download | gentoo-2-a63671a3ec4d6d6a023f527b792601ed0ad19579.tar.gz gentoo-2-a63671a3ec4d6d6a023f527b792601ed0ad19579.tar.bz2 gentoo-2-a63671a3ec4d6d6a023f527b792601ed0ad19579.zip | |
strip -fstack-protector if compiled with mmx|3dnow|sse, bug #37972, mark 86
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mjpegtools/ChangeLog | 10 | ||||
| -rw-r--r-- | media-video/mjpegtools/files/mjpegtools-1.6.2-nogtk.patch | 14 | ||||
| -rw-r--r-- | media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild | 8 |
3 files changed, 29 insertions, 3 deletions
diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog index 8c3423903a80..6d7a15d6e2e8 100644 --- a/media-video/mjpegtools/ChangeLog +++ b/media-video/mjpegtools/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-video/mjpegtools # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.69 2004/08/05 10:29:48 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.70 2004/09/25 14:57:16 lanius Exp $ + + 25 Sep 2004; Heinrich Wendel <lanius@gentoo.org> + +files/mjpegtools-1.6.2-nogtk.patch, mjpegtools-1.6.2-r3.ebuild: + mark x86 + + 25 Sep 2004; Heinrich Wendel <lanius@gentoo.org> + +files/mjpegtools-1.6.2-nogtk.patch, mjpegtools-1.6.2-r3.ebuild: + strip -fstack-protector if compiled with mmx|3dnow|sse, bug #37972 05 Aug 2004; Luca Barbato <lu_zero@gentoo.org> +files/mjpegtools-1.6.2-gcc34-altivec.patch, mjpegtools-1.6.2-r3.ebuild: diff --git a/media-video/mjpegtools/files/mjpegtools-1.6.2-nogtk.patch b/media-video/mjpegtools/files/mjpegtools-1.6.2-nogtk.patch new file mode 100644 index 000000000000..51a9a59f8515 --- /dev/null +++ b/media-video/mjpegtools/files/mjpegtools-1.6.2-nogtk.patch @@ -0,0 +1,14 @@ +--- configure.in 2004-02-03 23:57:29.000000000 +0100 ++++ configure.in.nogtk 2004-07-01 13:05:28.279752280 +0200 +@@ -364,11 +364,6 @@ + dnl Check for Gtk+/glib (for glav) + dnl ******************************************************************** + have_gtk=false +-ifdef([AM_PATH_GTK], +- [ AM_PATH_GTK(1.2.0, [ have_gtk=true +- AC_DEFINE(HAVE_GTK,1, +- [Gtk library present] +- )],,) ]) + + dnl ******************************************************************** + dnl Check for the SDL library (for software playback) diff --git a/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild b/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild index 1b6340fa258e..e526cb8c78ec 100644 --- a/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild +++ b/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild,v 1.3 2004/08/05 10:29:48 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild,v 1.4 2004/09/25 14:57:16 lanius Exp $ inherit flag-o-matic gcc eutils @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz" LICENSE="as-is" SLOT="1" -KEYWORDS="~x86 ~ppc" +KEYWORDS="x86 ~ppc" IUSE="gtk avi dv quicktime sdl X yv12 3dnow mmx sse" DEPEND="media-libs/jpeg @@ -37,6 +37,9 @@ src_unpack() { epatch ${FILESDIR}/${P}-gcc34.patch epatch ${FILESDIR}/${P}-gcc34-altivec.patch + # remove checks for gtk in configure in + use gtk || epatch ${FILESDIR}/${P}-nogtk.patch + # Fix an error in the detection of the altivec-support # in the compiler epatch "${FILESDIR}/altivec-fix-${PV}.patch" @@ -70,6 +73,7 @@ src_compile() { if use x86; then if use mmx || use 3dnow || use sse; then myconf="${myconf} --enable-simd-accel" + strip-flags -fstack-protector fi if use mmx; then myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx" |