diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-07-22 23:18:25 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-07-22 23:18:25 +0000 |
| commit | 69caaf695753a139cdbf9a7143c0a5e3f555b06f (patch) | |
| tree | 23fa0e84e8a87d727320723829a84c2258107517 /media-video/mjpegtools | |
| parent | ebuild from kde-testing overlay for guidance-power-manager 4.2.4 (diff) | |
| download | gentoo-2-69caaf695753a139cdbf9a7143c0a5e3f555b06f.tar.gz gentoo-2-69caaf695753a139cdbf9a7143c0a5e3f555b06f.tar.bz2 gentoo-2-69caaf695753a139cdbf9a7143c0a5e3f555b06f.zip | |
Fix patch to not modify Makefile.in, since it modifies Makefile.am and runs autotools.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-video/mjpegtools')
| -rw-r--r-- | media-video/mjpegtools/Manifest | 2 | ||||
| -rw-r--r-- | media-video/mjpegtools/files/mjpegtools-1.8.0-parallelmake.patch | 36 |
2 files changed, 1 insertions, 37 deletions
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest index 5bb40cd9f64d..0800fe4ccc45 100644 --- a/media-video/mjpegtools/Manifest +++ b/media-video/mjpegtools/Manifest @@ -5,7 +5,7 @@ AUX mjpegtools-1.8.0-lavrec-memleak.patch 2473 RMD160 fd6a6627659ab50f48d9f5c3d4 AUX mjpegtools-1.8.0-libc.patch 5515 RMD160 03ab695826ac6676c6e6f5bb1f5c2784eaff43d5 SHA1 cf03a43c25e7d4788a6dbff78fc8e89adf8560ed SHA256 02c7aef7d237d1af5bb86a4cca3194b71698e99d1250e44052d2fd9cb0560e06 AUX mjpegtools-1.8.0-libquicktime.patch 1186 RMD160 125fe4cfdecb5b98480d45670e3cb6d84f894c4f SHA1 205138f34d665174cb8f323669b8aa0ee4eb7785 SHA256 abf3043efbcdb29af2ee1b2a2e0b92b948a740d377d8e534635eb8599e6fb386 AUX mjpegtools-1.8.0-no-jpeg-mmx.patch 1539 RMD160 eb2b1756e65ce56b128e0c6763a27253d5cd9d4c SHA1 09e6c05a4c277498c277b9480d4f51c29e707b0c SHA256 f748ee564a03473ea027ab69d08fe1e25ab6ff05cbf4f223fefa657f1cd3e3aa -AUX mjpegtools-1.8.0-parallelmake.patch 2163 RMD160 1bf0d3c30601b2b6d421c8dad3167a42304cce39 SHA1 72c4caeb7d18f9bb82176bad8e10347da6ea3f1e SHA256 d2456d4a75c7c2b205fc9c71431aaae427dd5667c71dd3bee2fa4869cb438b03 +AUX mjpegtools-1.8.0-parallelmake.patch 829 RMD160 107cbf908041da6233a8b7340df0caff90cec253 SHA1 97de494ba20a164d06a02f6a5f869e971b8e2b0f SHA256 78e4f3288544a1e7f0733b70136f82a9927017fcde1efaa1a8b659be1f37c288 AUX mjpegtools-1.8.0-pkg-config.patch 423 RMD160 2d3d55fb7561a9c0ceeb7ce880953cb12662489c SHA1 5d284a7754816a5e48e364f512f1f1fe71b58e00 SHA256 3b26122803c1ea805534308137323ee119fbc29777fa4a588ebe6dade0a8d490 AUX mjpegtools-1.9.0-glibc-2.10.patch 429 RMD160 ef7f706aeda7ebfa04dbd43b70a5e3e6faf24610 SHA1 3029f0e835e693b144298ed9f8143c9566be26f3 SHA256 0a76b418df4daa1603c827001ede6a1b3da4457b5d3aefeda0a656cd88ad446b AUX mjpegtools-1.9.0_rc1-as-needed.patch 1015 RMD160 10c6f59d6a30c33d9ce18eab603b7faca5f238f6 SHA1 82c76d7caae15360ab11835b6667f63cfa8f2c89 SHA256 ee21d2d19e3eaa446d0c6708f496ea9b485da51d487863ea198c04d991e2a2b6 diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-parallelmake.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-parallelmake.patch index b21995e3cbb8..1755f87f0525 100644 --- a/media-video/mjpegtools/files/mjpegtools-1.8.0-parallelmake.patch +++ b/media-video/mjpegtools/files/mjpegtools-1.8.0-parallelmake.patch @@ -11,19 +11,6 @@ Index: mjpegtools-1.8.0/mpeg2enc/Makefile.am mpeg2enc_LDADD = \ $(top_builddir)/mpeg2enc/libmpeg2encpp.la \ -Index: mjpegtools-1.8.0/mpeg2enc/Makefile.in -=================================================================== ---- mjpegtools-1.8.0.orig/mpeg2enc/Makefile.in -+++ mjpegtools-1.8.0/mpeg2enc/Makefile.in -@@ -374,7 +374,7 @@ libmpeg2encpp_la_DEPENDENCIES = $(LIBMJP - libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS) - mpeg2enc_DEPENDENCIES = \ - $(LIBMJPEGUTILS) \ -- $(top_builddir)/mpeg2enc/libmpeg2encpp.la -+ libmpeg2encpp.la - - mpeg2enc_LDADD = \ - $(top_builddir)/mpeg2enc/libmpeg2encpp.la \ Index: mjpegtools-1.8.0/mplex/Makefile.am =================================================================== --- mjpegtools-1.8.0.orig/mplex/Makefile.am @@ -35,26 +22,3 @@ Index: mjpegtools-1.8.0/mplex/Makefile.am - $(top_builddir)/mplex/libmplex2.la \ + libmplex2.la \ @LIBGETOPT_LIB@ $(LIBM_LIBS) -Index: mjpegtools-1.8.0/mplex/Makefile.in -=================================================================== ---- mjpegtools-1.8.0.orig/mplex/Makefile.in -+++ mjpegtools-1.8.0/mplex/Makefile.in -@@ -95,8 +95,7 @@ PROGRAMS = $(bin_PROGRAMS) - am_mplex_OBJECTS = main.$(OBJEXT) - mplex_OBJECTS = $(am_mplex_OBJECTS) - am__DEPENDENCIES_2 = --mplex_DEPENDENCIES = $(top_builddir)/mplex/libmplex2.la \ -- $(am__DEPENDENCIES_2) -+mplex_DEPENDENCIES = libmplex2.la $(am__DEPENDENCIES_2) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles -@@ -340,7 +339,7 @@ libmplex2_la_LIBADD = $(top_builddir)/ut - libmplex2_la_CXXFLAGS = $(ZALPHA_FLAGS) - mplex_SOURCES = main.cpp - mplex_LDADD = \ -- $(top_builddir)/mplex/libmplex2.la \ -+ libmplex2.la \ - @LIBGETOPT_LIB@ $(LIBM_LIBS) - - all: all-am |