Changeset - 73c78360e85c
Parent rev.
Child rev.
[Not reviewed]
default
2 4 1
Nathan Brink (binki) - 15 years ago 2010-03-03 18:43:00
ohnobinki@ohnopublishing.net
Fix inclusion of SDL.h on portage-multilib with patch.
7 files changed with 118 insertions and 212 deletions:
media-video/mjpegtools/ChangeLog
7
media-video/mjpegtools/Manifest
3
6
media-video/mjpegtools/files/mjpegtools-1.9.0-include-SDL.patch
87
media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild
101
media-video/mjpegtools/mjpegtools-1.9.0-r1.ebuild
14
13
media-video/mjpegtools/mjpegtools-1.9.0.ebuild
86
sys-devel/libtool/files/2.2.6b/libtool-2.2.6b-ltdl.m4-no-la.patch
7
6
0 comments (0 inline, 0 general)
media-video/mjpegtools/ChangeLog
➞
Show inline comments
 
@@ -2,6 +2,13 @@
 
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 
# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.148 2010/02/20 14:46:51 armin76 Exp $
 

			




	
	
	
		
 
  03 Mar 2010; Nathan Phillip Brink (ohnobinki)

			




	
	
	
		
 
  <ohnobinki@ohnopublishing.net> -mjpegtools-1.8.0-r2.ebuild,

			




	
	
	
		
 
  -mjpegtools-1.9.0.ebuild, mjpegtools-1.9.0-r1.ebuild,

			




	
	
	
		
 
  +files/mjpegtools-1.9.0-include-SDL.patch:

			




	
	
	
		
 
  Replace SDL/SDL.h with SDL.h via patch to fix compilation issue for

			




	
	
	
		
 
  portage-multilib. Cleaned up ebuild after upgrading it to EAPI="2".

			




	
	
	
		
 

			




	
	
	
		
 
  20 Feb 2010; Raúl Porcel <armin76@gentoo.org> mjpegtools-1.9.0-r1.ebuild:

			




	
	
	
		
 
  alpha/sparc stable wrt #302435

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    media-video/mjpegtools/Manifest
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -9,12 +9,9 @@ AUX mjpegtools-1.8.0-no-jpeg-mmx.patch 1

			




	
	
	
		
 
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-include-SDL.patch 3075 RMD160 11a0c65c32d8ab69541d2862089fc902ae8bdbfc SHA1 18a81887507b3a95222b6b22760b6b0cb3d33ba0 SHA256 082d0fcb7a2965b593e7cf9a25713cfc9d4b014a11a824f4c339c84ce08d638e

			




	
	
	
		
 
AUX mjpegtools-1.9.0-jpeg-7.patch 774 RMD160 22c50dd28617159eaa89aefb4647e21d4d9972e7 SHA1 2bdb1b3b8591cede11d4a133a758e8ead35db4dd SHA256 2c9b90a283e8e6d95bd9573cd16310107c654d0d701a7dff7e47ee1a773da7cf

			




	
	
	
		
 
DIST mjpegtools-1.8.0.tar.gz 1475998 RMD160 4d97a6a721f29223975605e2a5e645b4d7d129b5 SHA1 e11d68298a64b52f98724dbf3fd14f168e140290 SHA256 d841575c72cd0e587c1bab703d0906e3d23bf428424000557739cf5d6097209a

			




	
	
	
		
 
DIST mjpegtools-1.9.0.tar.gz 1718063 RMD160 79e0eb4bce468bb8f12da336e29abe8fab390a5f SHA1 1701233354c7ea86b5b7808c4dd5d03a71118e48 SHA256 a9322aaab1e0835fbaa00fc10e58e885833454fa0ad6f57c60c89a78f7ed1711

			




	
	
	
		
 
DIST mjpegtools-m4-1.tar.bz2 4547 RMD160 b81b89bb6364023606a1d3ca9519e143fe053ab4 SHA1 4c69f9918dcc56fc544fef9af9aaed968da1ae67 SHA256 10de1e206ee9c84aae111e95f655ad9394be749bfed01d337f7ff9a983aab522

			




	
	
	
		
 
EBUILD mjpegtools-1.8.0-r2.ebuild 2880 RMD160 299aa207ae34c594a5bc8406dc557d86cede7194 SHA1 0e1b6da3472e448007d739f7f6bee140c4c837e0 SHA256 c0a57f6d2c725be7bcdd14b2f64fb7d742bd38a705a7206051d5a027221ac6c6

			




	
	
	
		
 
EBUILD mjpegtools-1.9.0-r1.ebuild 2150 RMD160 13a84a81bc4d1deb680c4c3cc53def3232fd3546 SHA1 efca080755aedfc37602f8c9f257d22ca5d032b2 SHA256 4e3cb6e36bcc7628f2466873cb51dfd8ccb208496b1ca7233463547b714510da

			




	
	
	
		
 
EBUILD mjpegtools-1.9.0.ebuild 2113 RMD160 3a3dbe661cba9c59c9f451c1a4fd348a569a2ca8 SHA1 edd1de8894068d44773628e9aa55dca3f4786f23 SHA256 1c8c5c5a751efbb7cdb50254896123c5cdc67ca5d607abe92fb4ff4b84c1d971

			




	
	
	
		
 
MISC ChangeLog 26011 RMD160 d202cc58271dd81acef7cdab5047e30103f761fd SHA1 c73aa6b3cbd5d93ded636ba44de7e1b04eea1445 SHA256 ae6c8c939932296b4bb35de2b777672ef08cab4bdf39275d911c5998881d1677

			




	
	
	
		
 
EBUILD mjpegtools-1.9.0-r1.ebuild 2108 RMD160 7b49ec81a4434a481e8775e01f833dfc0602a46a SHA1 1f389522c024dbd616701417208d5229a13e5b0f SHA256 0aea55f079c15722767c66811aa568fb0f86933f22cf62f44ca46e2f4af2f7e7

			




	
	
	
		
 
MISC ChangeLog 26363 RMD160 3143bb635cf97b8073afc4996eabf19804936233 SHA1 4801e8eaf2120b9d08d2a3087897336e4e2ba857 SHA256 6600707a1256ccbbb08a097b525b1535ab75f0607298bc14eabcfe6d86676b3b

			




	
	
	
		
 
MISC metadata.xml 415 RMD160 cdbf5de3ece63e3df10d1a4e69ed5e471abb84fa SHA1 5ae767eb57a50fff79f938a01332e67f88306aff SHA256 75cf2c90452ef1a74f46812e6ffee8c2f25a979f3a0b8e366032ee60bdb8663b

			




        

    


    
    

    

        

                

                    media-video/mjpegtools/files/mjpegtools-1.9.0-include-SDL.patch
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
Patch by Nathan Phillip Brink <ohnobinki@ohnopublishing.net> against ~mjpegtools-1.9.0

			




	
	
	
		
 
* Fix mjpegtool's #include <SDL/SDL.h>

			




	
	
	
		
 
  http://www.libsdl.org/faq.php?action=listentries&category=2#19

			




	
	
	
		
 
* Insert SDL_CFLAGS into Makefile.am

			




	
	
	
		
 

			




	
	
	
		
 
fixes compile errors for portage-multilib reported on 2010/03/03 by xming

			




	
	
	
		
 

			




	
	
	
		
 
Index: lavtools/Makefile.am

			




	
	
	
		
 
===================================================================

			




	
	
	
		
 
RCS file: /cvsroot/mjpeg/mjpeg_play/lavtools/Makefile.am,v

			




	
	
	
		
 
retrieving revision 1.121

			




	
	
	
		
 
diff -u -b -B -r1.121 Makefile.am

			




	
	
	
		
 
--- lavtools/Makefile.am	9 Apr 2008 04:36:00 -0000	1.121

			




	
	
	
		
 
+++ lavtools/Makefile.am	3 Mar 2010 23:19:18 -0000

			




	
	
	
		
 
@@ -55,7 +55,7 @@

			




	
	
	
		
 
 liblavrec_la_DEPENDENCIES = liblavfile.la liblavjpeg.la

			




	
	
	
		
 
 

			




	
	
	
		
 
 liblavplay_la_SOURCES = liblavplay.c audiolib.c

			




	
	
	
		
 
-liblavplay_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(X_CFLAGS)

			




	
	
	
		
 
+liblavplay_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(X_CFLAGS) $(SDL_CFLAGS)

			




	
	
	
		
 
 liblavplay_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)

			




	
	
	
		
 
 liblavplay_la_LIBADD = liblavfile.la $(SDL_LIBS) liblavjpeg.la $(LIBDV_LIBS) $(LIBMJPEGUTILS)

			




	
	
	
		
 
 if HAVE_V4L

			




	
	
	
		
 
@@ -131,6 +131,7 @@

			




	
	
	
		
 
 multiblend_flt_LDADD = $(LIBMJPEGUTILS)

			




	
	
	
		
 
 

			




	
	
	
		
 
 lavplay_SOURCES = lavplay.c

			




	
	
	
		
 
+lavplay_CPPFLAGS = $(AM_CPPFLAGS) $(SDL_CFLAGS)

			




	
	
	
		
 
 lavplay_LDADD = $(LIBMJPEGUTILS) \

			




	
	
	
		
 
 	liblavplay.la liblavjpeg.la liblavfile.la \

			




	
	
	
		
 
 	@LIBGETOPT_LIB@ @PTHREAD_LIBS@ $(SDL_LIBS)

			




	
	
	
		
 
@@ -175,6 +176,7 @@

			




	
	
	
		
 
 lavvideo_SOURCES = lavvideo.c frequencies.c

			




	
	
	
		
 
 

			




	
	
	
		
 
 yuvplay_SOURCES = yuvplay.c

			




	
	
	
		
 
+yuvplay_CPPFLAGS = $(AM_CPPFLAGS) $(SDL_CFLAGS)

			




	
	
	
		
 
 yuvplay_LDADD = $(SDL_LIBS) $(LIBMJPEGUTILS)

			




	
	
	
		
 
 

			




	
	
	
		
 
 ppmtoy4m_SOURCES = ppmtoy4m.c colorspace.c subsample.c

			




	
	
	
		
 
Index: lavtools/lavplay.c

			




	
	
	
		
 
===================================================================

			




	
	
	
		
 
RCS file: /cvsroot/mjpeg/mjpeg_play/lavtools/lavplay.c,v

			




	
	
	
		
 
retrieving revision 1.65

			




	
	
	
		
 
diff -u -b -B -r1.65 lavplay.c

			




	
	
	
		
 
--- lavtools/lavplay.c	25 Aug 2006 04:01:47 -0000	1.65

			




	
	
	
		
 
+++ lavtools/lavplay.c	3 Mar 2010 23:19:19 -0000

			




	
	
	
		
 
@@ -148,7 +148,7 @@

			




	
	
	
		
 
 #include <sys/stat.h>

			




	
	
	
		
 
 #endif

			




	
	
	
		
 
 #ifdef HAVE_SDL      /* Seems that this is needed so MAC OS X is also happy */

			




	
	
	
		
 
-#include <SDL/SDL.h>

			




	
	
	
		
 
+#include <SDL.h>

			




	
	
	
		
 
 #endif

			




	
	
	
		
 
 

			




	
	
	
		
 
 #define LAVPLAY_VSTR "lavplay" VERSION  /* Expected version info */

			




	
	
	
		
 
Index: lavtools/liblavplay.c

			




	
	
	
		
 
===================================================================

			




	
	
	
		
 
RCS file: /cvsroot/mjpeg/mjpeg_play/lavtools/liblavplay.c,v

			




	
	
	
		
 
retrieving revision 1.42

			




	
	
	
		
 
diff -u -b -B -r1.42 liblavplay.c

			




	
	
	
		
 
--- lavtools/liblavplay.c	25 Aug 2006 04:01:47 -0000	1.42

			




	
	
	
		
 
+++ lavtools/liblavplay.c	3 Mar 2010 23:19:19 -0000

			




	
	
	
		
 
@@ -80,7 +80,7 @@

			




	
	
	
		
 
 #include <pthread.h>

			




	
	
	
		
 
 

			




	
	
	
		
 
 #ifdef HAVE_SDL

			




	
	
	
		
 
-#include <SDL/SDL.h>

			




	
	
	
		
 
+#include <SDL.h>

			




	
	
	
		
 
 #endif

			




	
	
	
		
 
 

			




	
	
	
		
 
 #include "mjpeg_logging.h"

			




	
	
	
		
 
Index: lavtools/yuvplay.c

			




	
	
	
		
 
===================================================================

			




	
	
	
		
 
RCS file: /cvsroot/mjpeg/mjpeg_play/lavtools/yuvplay.c,v

			




	
	
	
		
 
retrieving revision 1.25

			




	
	
	
		
 
diff -u -b -B -r1.25 yuvplay.c

			




	
	
	
		
 
--- lavtools/yuvplay.c	15 Nov 2005 04:31:37 -0000	1.25

			




	
	
	
		
 
+++ lavtools/yuvplay.c	3 Mar 2010 23:19:19 -0000

			




	
	
	
		
 
@@ -31,7 +31,7 @@

			




	
	
	
		
 
 #include "mjpeg_logging.h"

			




	
	
	
		
 
 #include <mpegconsts.h>

			




	
	
	
		
 
 #include <mpegtimecode.h>

			




	
	
	
		
 
-#include <SDL/SDL.h>

			




	
	
	
		
 
+#include <SDL.h>

			




	
	
	
		
 
 #include <sys/time.h>

			




	
	
	
		
 
 

			




	
	
	
		
 
 

			




        

    


    
    

    

        

                

                    media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
deleted file

			




        

    


    
    

    

        

                

                    media-video/mjpegtools/mjpegtools-1.9.0-r1.ebuild
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2,9 +2,9 @@

			




	
	
	
		
 
# Distributed under the terms of the GNU General Public License v2

			




	
	
	
		
 
# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.9.0-r1.ebuild,v 1.6 2010/02/20 14:46:51 armin76 Exp $

			




	
	
	
		
 

			




	
	
	
		
 
EAPI="1"

			




	
	
	
		
 
EAPI="2"

			




	
	
	
		
 

			




	
	
	
		
 
inherit flag-o-matic toolchain-funcs eutils libtool

			




	
	
	
		
 
inherit autotools flag-o-matic toolchain-funcs eutils libtool

			




	
	
	
		
 

			




	
	
	
		
 
MY_P=${P/_/}

			




	
	
	
		
 

			




	
	
		
 
@@ -33,15 +33,16 @@ DEPEND="${RDEPEND}

			




	
	
	
		
 

			




	
	
	
		
 
S="${WORKDIR}/${MY_P}"

			




	
	
	
		
 

			




	
	
	
		
 
src_unpack() {

			




	
	
	
		
 
	unpack ${A}

			




	
	
	
		
 
	cd "${S}"

			




	
	
	
		
 
src_prepare() {

			




	
	
	
		
 
	sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure

			




	
	
	
		
 
	epatch "${FILESDIR}"/${P}-glibc-2.10.patch \

			




	
	
	
		
 
		"${FILESDIR}"/${P}-jpeg-7.patch

			




	
	
	
		
 

			




	
	
	
		
 
	epatch "${FILESDIR}"/${P}-include-SDL.patch

			




	
	
	
		
 
	eautomake

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
src_compile() {

			




	
	
	
		
 
src_configure() {

			




	
	
	
		
 
	local myconf

			




	
	
	
		
 

			




	
	
	
		
 
	if use yv12 && use dv; then

			




	
	
		
 
@@ -68,20 +69,20 @@ src_compile() {

			




	
	
	
		
 
		--without-jpeg-mmx \

			




	
	
	
		
 
		${myconf} || die "configure failed"

			




	
	
	
		
 

			




	
	
	
		
 
	emake || die "emake failed"

			




	
	
	
		
 

			




	
	
	
		
 
	cd docs

			




	
	
	
		
 
	local infofile

			




	
	
	
		
 
	for infofile in mjpeg*info*; do

			




	
	
	
		
 
		echo "INFO-DIR-SECTION Miscellaneous" >> ${infofile}

			




	
	
	
		
 
		echo "START-INFO-DIR-ENTRY" >> ${infofile}

			




	
	
	
		
 
		echo "* mjpeg-howto: (mjpeg-howto).					 How to use the mjpeg-tools" >> ${infofile}

			




	
	
	
		
 
		echo "END-INFO-DIR-ENTRY" >> ${infofile}

			




	
	
	
		
 
		cat <<EOF >> ${infofile}

			




	
	
	
		
 
INFO-DIR-SECTION Miscellaneous

			




	
	
	
		
 
START-INFO-DIR-ENTRY

			




	
	
	
		
 
* mjpeg-howto: (mjpeg-howto).					 How to use the mjpeg-tools

			




	
	
	
		
 
END-INFO-DIR-ENTRY

			




	
	
	
		
 
EOF

			




	
	
	
		
 
	done

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
src_install() {

			




	
	
	
		
 
	einstall || die "install failed"

			




	
	
	
		
 
	dodoc mjpeg_howto.txt README* PLANS NEWS TODO HINTS BUGS ChangeLog \

			




	
	
	
		
 
		AUTHORS CHANGES

			




	
	
	
		
 
		AUTHORS CHANGES || die

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    media-video/mjpegtools/mjpegtools-1.9.0.ebuild
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
deleted file

			




        

    


    
    

    

        

                

                    sys-devel/libtool/files/2.2.6b/libtool-2.2.6b-ltdl.m4-no-la.patch
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
https://bugs.gentoo.org/293921

			




	
	
	
		
 

			




	
	
	
		
 
ohnobinki's attempt at convincing ltdl.m4 to permit people

			




	
	
	
		
 
to delete that special type of libtool archive which has

			




	
	
	
		
 
no use on a modern GNU/Linux system.

			




	
	
	
		
 
ohnobinki's attempt at convincing ltdl.m4 to permit people to

			




	
	
	
		
 
delete libltdl.la. This is a special type of libtool archive

			




	
	
	
		
 
which has no use on a modern GNU/Linux system using dynamic

			




	
	
	
		
 
linking.

			




	
	
	
		
 

			




	
	
	
		
 
bourne+POSIX compatibility fixed by ferret_, reviewed by tommy[d].

			




	
	
	
		
 

			




	
	
		
 
@@ -16,9 +17,9 @@ index 111fac1..0e823ed 100644

			




	
	
	
		
 
 if test -n "$with_ltdl_lib"; then

			




	
	
	
		
 
-  if test -f "$with_ltdl_lib/libltdl.la"; then :

			




	
	
	
		
 
-  else

			




	
	
	
		
 
+  # check for the existence of "$with_ltdl_lib/libltdl.la" while

			




	
	
	
		
 
+  # allowing people to libtool archive file (which isn't useful

			




	
	
	
		
 
+  # in this case in many common platforms.)

			




	
	
	
		
 
+  # Check for the existence of "$with_ltdl_lib"/libltdl.* -- allow

			




	
	
	
		
 
+  # people to delete libltdl.la (which isn't useful in this case

			




	
	
	
		
 
+  # for many common platforms.)

			




	
	
	
		
 
+  with_ltdl_lib_libname=`echo "$with_ltdl_lib"/libltdl.*`

			




	
	
	
		
 
+  if test "x$with_ltdl_lib_libname" = "x$with_ltdl_lib/libltdl.*"; then

			




	
	
	
		
 
     AC_MSG_ERROR([invalid ltdl library directory: `$with_ltdl_lib'])

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-26437
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support