Changeset - 8730ea995bd4
Parent rev.
Child rev.
[Not reviewed]
default
0 5 1
Nathan Brink (binki) - 15 years ago 2010-03-07 12:53:41
ohnobinki@ohnopublishing.net
Patch to replace SDL/SDL.h with SDL.h for portage-multilib.
6 files changed with 117 insertions and 14 deletions:
media-video/vlc/ChangeLog
8
media-video/vlc/Manifest
5
14
media-video/vlc/files/vlc-1.0.4-sdl-portage-multilib.patch
95
media-video/vlc/vlc-1.0.4.ebuild
3
media-video/vlc/vlc-1.0.5.ebuild
3
media-video/vlc/vlc-1.0.9999.ebuild
3
0 comments (0 inline, 0 general)
media-video/vlc/ChangeLog
➞
Show inline comments
 
# ChangeLog for media-video/vlc
 
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 
# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.558 2010/02/24 13:13:36 aballier Exp $
 

			




	
	
	
		
 
  07 Mar 2010; Nathan Phillip Brink (ohnobinki)

			




	
	
	
		
 
  <ohnobinki@ohnopublishing.net> vlc-1.0.4.ebuild,

			




	
	
	
		
 
  +files/vlc-1.0.4-sdl-portage-multilib.patch, vlc-1.0.5.ebuild,

			




	
	
	
		
 
  vlc-1.0.9999.ebuild:

			




	
	
	
		
 
  Add patch that replaces references to SDL/SDL.h with SDL.h for

			




	
	
	
		
 
  portage-multilib support:

			




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

			




	
	
	
		
 

			




	
	
	
		
 
  24 Feb 2010; Alexis Ballier <aballier@gentoo.org> vlc-1.0.5.ebuild,

			




	
	
	
		
 
  vlc-1.0.9999.ebuild:

			




	
	
	
		
 
  Add a conditional patch for 1.0.x series to build against xulrunner 1.9.2,

			




	
	
	
		
 
  bug #290318

			




	
	
	
		
 

			




	
	
	
		
 
  24 Feb 2010; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild:

			




        

    


    
    

    

        

                

                    media-video/vlc/Manifest
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
-----BEGIN PGP SIGNED MESSAGE-----

			




	
	
	
		
 
Hash: SHA1

			




	
	
	
		
 

			




	
	
	
		
 
AUX vlc-1.0.4-sdl-portage-multilib.patch 3773 RMD160 d9a0e2d71288d2b0cf2029fac19d25d17ad909ab SHA1 602907944e9de2d30f8263760e8a38ec0bbfa25e SHA256 969b4782e50ec2f06e8eeee76af16b20258063acb403055ab239d71f7373e47e

			




	
	
	
		
 
DIST vlc-1.0.4.tar.bz2 21622966 RMD160 d4d9dae5dfe7d081d17197e5b94a43e54b213368 SHA1 59d99dd005f70b3442c1c44472640e10fdc15aa5 SHA256 dbff0ba0cd60a4323f85fd8b918f2a4477a11c5a8f628d1b868fb5947e8e9896

			




	
	
	
		
 
DIST vlc-1.0.5.tar.bz2 21887131 RMD160 de50206ddce59d1487ea7d4efa8bbd37f55b928e SHA1 a2c415923850720dc4499de0b6f6dbe40e98f90f SHA256 f7f1994c936fbb8c392481a13abfd6a6b76c5aac4406fa7a78d4786dfc206dcd

			




	
	
	
		
 
DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54

			




	
	
	
		
 
DIST vlc-patches-79.tar.bz2 6483 RMD160 f4bb903049b35c411ead3d812c865ac97d42c905 SHA1 b650ae71e4a59397be5a74cb7de5101d030ee04a SHA256 c2956b049de208408d64175792c936f8fcd325bd51c21d76158ba38107dda800

			




	
	
	
		
 
DIST vlc-patches-82.tar.bz2 5209 RMD160 d44813b8033303507a4a65411cf46d3963be9349 SHA1 e0adbc632af430c93573dc2539cdee66dfd20bf1 SHA256 7b3afbb9565352888265ddc9b1ce03b6097824e402d00e5711e426289946b0be

			




	
	
	
		
 
DIST vlc-patches-83.tar.bz2 9277 RMD160 b585a84187f42c3e5cb557e6d752ffde26585506 SHA1 91bcd66f3b393202153595e8c44926cc051d7451 SHA256 c3c2b7841bde69762feed36758d95ccd5cc0ee390310cfad91bbfa3bca72b1e3

			




	
	
	
		
 
EBUILD vlc-1.0.4.ebuild 11944 RMD160 6b11b400fbd13fb09dab6720d4e6dd85b377f5b9 SHA1 38c2db38a27aa6ae03d6aff685d80b0289e68e04 SHA256 1bb7ec981c0c2518e6b46711f71336c340c0f8be58789ad4eddee6a3200b17c2

			




	
	
	
		
 
EBUILD vlc-1.0.5.ebuild 12064 RMD160 cd4b0efc8871ae051d540271590181a78bbbefd0 SHA1 fc91424ebaea8438ff2716799c69956462ca4804 SHA256 bf50d19c6eb96a235ce42bfd04b645ac9c4212fd5577dd6ceb261add9495e755

			




	
	
	
		
 
EBUILD vlc-1.0.9999.ebuild 12016 RMD160 e33004803ad2459cc8e0205572b355b97dbe5e82 SHA1 50a8d12feb671972054d80e964b654c89de1aa9d SHA256 7c8eedd4ad29f5de0d7620e341aaa1f2b92f57e8c747332a152930953d93cc8c

			




	
	
	
		
 
EBUILD vlc-1.0.4.ebuild 12029 RMD160 ed61a3b2b18bbdc567340154452ad4dcc5f5263c SHA1 6541e296861f2448a4e53806bdec21272c753dfb SHA256 9b88bd95e853356c11fbc13ea79b2ac1953ef7173572386ef99f0573f13403b9

			




	
	
	
		
 
EBUILD vlc-1.0.5.ebuild 12149 RMD160 c3a5e7208c2377e7f81f96a30585062c78921525 SHA1 ff16763178c324dd8712e27499c142e64237fc86 SHA256 3d9ca05d2b2c0a08856080241d49cd033e4a5ad5be8b67c0b13186114a235a1a

			




	
	
	
		
 
EBUILD vlc-1.0.9999.ebuild 12101 RMD160 aeb25beb2b2001e3a4869ce9ce4e8ac7a0ec9a7b SHA1 d29ff838f0a7aeca3d39930678d0f32de26c91c9 SHA256 415f00e26d2b3a59b4e3a8661f61efe6777dd4ae3f3f5b1aee716155140bb22f

			




	
	
	
		
 
EBUILD vlc-9999.ebuild 11679 RMD160 20a48aef3d36bc967ef68ad9d1c5dc1614f39621 SHA1 508a93cba03da6038d553aff62993a3e2486cf2c SHA256 ef743e290fd4e0027fbd2c6b3215b3d91bb63c48baad53a9f4981ae08c385c11

			




	
	
	
		
 
MISC ChangeLog 86903 RMD160 d8b352792d8e95e012458460339fbe9d2d8f83a8 SHA1 125e5a75368e2fd471d094604e51b62f209610b1 SHA256 eed52761672e5d893a1695ce1baa0095136b7a352d76089dcf923345d7453f54

			




	
	
	
		
 
MISC ChangeLog 87249 RMD160 462729abd67f39b6da7d021767594f24f7742a8e SHA1 fc6714401bc395730a0a6cd297f5d852fa51fc2b SHA256 374577cc1babc536b526bd7ec7e0a1ecffb9a6cdeafbbafd9a977999a5e42a27

			




	
	
	
		
 
MISC metadata.xml 4152 RMD160 371740d72f49649ff3d8e3e9397730962c85d4a3 SHA1 69e10d0465819e595218136e1bdf6fe12f9ab099 SHA256 c5ca4cd5ddfbb0cf93c851eb9f12ac33d561cbeb8fcef9df64eb79c1f9023632

			




	
	
	
		
 
-----BEGIN PGP SIGNATURE-----

			




	
	
	
		
 
Version: GnuPG v2.0.14 (GNU/Linux)

			




	
	
	
		
 

			




	
	
	
		
 
iEYEARECAAYFAkuFJgcACgkQvFcC4BYPU0pwBgCcDRz2YJ+omHCSnVane7770WpT

			




	
	
	
		
 
vvkAoIVS2tdj96nPFx1KdGeh4l/aNFs6

			




	
	
	
		
 
=ehi4

			




	
	
	
		
 
-----END PGP SIGNATURE-----

			




        

    


    
    

    

        

                

                    media-video/vlc/files/vlc-1.0.4-sdl-portage-multilib.patch
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
--- configure.ac	2009-12-10 12:09:25.000000000 -0500

			




	
	
	
		
 
+++ configure.ac	2010-03-06 11:12:00.000000000 -0500

			




	
	
	
		
 
@@ -4249,20 +4254,14 @@

			




	
	
	
		
 
       fi ])

			




	
	
	
		
 
   AC_PATH_PROG(SDL12_CONFIG, sdl12-config, no, ${SDL_PATH})

			




	
	
	
		
 
   SDL_CONFIG="${SDL12_CONFIG}"

			




	
	
	
		
 
-  SDL_HEADER="SDL12/SDL.h"

			




	
	
	
		
 
-  SDL_IMAGE="SDL12/SDL_image.h"

			




	
	
	
		
 
   if test "${SDL_CONFIG}" = "no"

			




	
	
	
		
 
   then

			




	
	
	
		
 
     AC_PATH_PROG(SDL11_CONFIG, sdl11-config, no, ${SDL_PATH})

			




	
	
	
		
 
     SDL_CONFIG=${SDL11_CONFIG}

			




	
	
	
		
 
-    SDL_HEADER="SDL11/SDL.h"

			




	
	
	
		
 
-    SDL_IMAGE="SDL11/SDL_image.h"

			




	
	
	
		
 
   fi

			




	
	
	
		
 
   if test "${SDL_CONFIG}" = "no"

			




	
	
	
		
 
   then

			




	
	
	
		
 
     AC_PATH_PROG(SDL_CONFIG, sdl-config, no, ${SDL_PATH})

			




	
	
	
		
 
-    SDL_HEADER="SDL/SDL.h"

			




	
	
	
		
 
-    SDL_IMAGE="SDL/SDL_image.h"

			




	
	
	
		
 
   fi

			




	
	
	
		
 
   # check for cross-compiling

			




	
	
	
		
 
   SDL_PREFIX=

			




	
	
	
		
 
@@ -4281,20 +4280,16 @@

			




	
	
	
		
 
       VLC_ADD_PLUGIN([vout_sdl])

			




	
	
	
		
 
       VLC_ADD_PLUGIN([aout_sdl])

			




	
	
	
		
 
     fi

			




	
	
	
		
 
-    VLC_ADD_CFLAGS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} ${SDL_PREFIX} --cflags | sed 's,SDL,,'`])

			




	
	
	
		
 
+    VLC_ADD_CFLAGS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} ${SDL_PREFIX} --cflags`])

			




	
	
	
		
 
     VLC_ADD_LIBS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} ${SDL_PREFIX} --libs | sed 's,-rdynamic,,'`])

			




	
	
	
		
 
     CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_vout_sdl}"

			




	
	
	
		
 
-    AC_CHECK_HEADERS(${SDL_HEADER}, AC_DEFINE_UNQUOTED(SDL_INCLUDE_FILE,

			




	
	
	
		
 
-      <${SDL_HEADER}>, Indicate whether we should use SDL/SDL.h or SDL11/SDL.h),

			




	
	
	
		
 
-      [ AC_CHECK_HEADERS(SDL.h, AC_DEFINE(SDL_INCLUDE_FILE, <SDL.h>,

			




	
	
	
		
 
-          As a last resort we also test for SDL.h presence),

			




	
	
	
		
 
-      [ AC_MSG_ERROR([The development package for SDL is not installed.

			




	
	
	
		
 
+    AC_CHECK_HEADERS(SDL.h, [], [

			




	
	
	
		
 
+      AC_MSG_ERROR([The development package for SDL is not installed.

			




	
	
	
		
 
 Please install it and try again. Alternatively you can also configure with

			




	
	
	
		
 
 --disable-sdl.])

			




	
	
	
		
 
-      ])])

			




	
	
	
		
 
+      ])

			




	
	
	
		
 
     AS_IF([ test "${enable_sdl_image}" != "no"],[

			




	
	
	
		
 
-      AC_CHECK_HEADERS(${SDL_IMAGE}, [AC_DEFINE_UNQUOTED(SDL_IMAGE_INCLUDE_FILE,

			




	
	
	
		
 
-        <${SDL_IMAGE}>, Indicate the path of SDL_image.h)

			




	
	
	
		
 
+      AC_CHECK_HEADERS(SDL_image.h, [

			




	
	
	
		
 
         VLC_ADD_PLUGIN([sdl_image])

			




	
	
	
		
 
         AC_CHECK_LIB(png, png_set_rows,

			




	
	
	
		
 
           [VLC_ADD_LIBS([sdl_image],[-lpng -lz])],[],[-lz])

			




	
	
	
		
 
@@ -4303,11 +4298,9 @@

			




	
	
	
		
 
         AC_CHECK_LIB(tiff, TIFFClientOpen,

			




	
	
	
		
 
           [VLC_ADD_LIBS([sdl_image],[-ltiff])])

			




	
	
	
		
 
         VLC_ADD_LIBS([sdl_image], [-lSDL_image])],

			




	
	
	
		
 
-        [ AC_CHECK_HEADERS(SDL_image.h, AC_DEFINE(SDL_IMAGE_INCLUDE_FILE, <SDL_image.h>,

			




	
	
	
		
 
-            As a last resort we also test for SDL_image.h presence),

			




	
	
	
		
 
         [ AC_MSG_WARN([The development package for SDL_image is not installed.

			




	
	
	
		
 
   You should install it alongside your SDL package.])

			




	
	
	
		
 
-        ])])

			




	
	
	
		
 
+        ])

			




	
	
	
		
 
     ])

			




	
	
	
		
 
     CPPFLAGS="${CPPFLAGS_save}"

			




	
	
	
		
 
     if expr 1.1.5 \> `${SDL_CONFIG} --version` >/dev/null

			




	
	
	
		
 
--- modules/codec/sdl_image.c	2009-12-07 16:12:57.000000000 -0500

			




	
	
	
		
 
+++ modules/codec/sdl_image.c	2010-03-06 11:21:18.000000000 -0500

			




	
	
	
		
 
@@ -33,7 +33,7 @@

			




	
	
	
		
 
 #include <vlc_codec.h>

			




	
	
	
		
 
 #include <vlc_vout.h>

			




	
	
	
		
 
 

			




	
	
	
		
 
-#include SDL_IMAGE_INCLUDE_FILE

			




	
	
	
		
 
+#include <SDL_image.h>

			




	
	
	
		
 
 

			




	
	
	
		
 
 /*****************************************************************************

			




	
	
	
		
 
  * decoder_sys_t : sdl decoder descriptor

			




	
	
	
		
 
--- modules/audio_output/sdl.c	2009-12-07 16:12:57.000000000 -0500

			




	
	
	
		
 
+++ modules/audio_output/sdl.c	2010-03-06 11:05:57.000000000 -0500

			




	
	
	
		
 
@@ -37,7 +37,7 @@

			




	
	
	
		
 
 #include <vlc_plugin.h>

			




	
	
	
		
 
 #include <vlc_aout.h>

			




	
	
	
		
 
 

			




	
	
	
		
 
-#include SDL_INCLUDE_FILE

			




	
	
	
		
 
+#include <SDL.h>

			




	
	
	
		
 
 

			




	
	
	
		
 
 #define FRAME_SIZE 2048

			




	
	
	
		
 
 

			




	
	
	
		
 
--- modules/video_output/sdl.c	2009-12-07 16:12:58.000000000 -0500

			




	
	
	
		
 
+++ modules/video_output/sdl.c	2010-03-06 11:05:57.000000000 -0500

			




	
	
	
		
 
@@ -45,7 +45,7 @@

			




	
	
	
		
 
 #   include <netinet/in.h>                            /* BSD: struct in_addr */

			




	
	
	
		
 
 #endif

			




	
	
	
		
 
 

			




	
	
	
		
 
-#include SDL_INCLUDE_FILE

			




	
	
	
		
 
+#include <SDL.h>

			




	
	
	
		
 
 

			




	
	
	
		
 
 /* SDL is not able to crop overlays - so use only 1 direct buffer */

			




	
	
	
		
 
 #define SDL_MAX_DIRECTBUFFERS 1

			




        

    


    
    

    

        

                

                    media-video/vlc/vlc-1.0.4.ebuild
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -227,12 +227,15 @@ src_prepare() {

			




	
	
	
		
 
		git_src_prepare

			




	
	
	
		
 
	fi

			




	
	
	
		
 
	# Make it build with libtool 1.5

			




	
	
	
		
 
	rm -f m4/lt* m4/libtool.m4

			




	
	
	
		
 

			




	
	
	
		
 
	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"

			




	
	
	
		
 
	# portage-multilib SDL.h fix

			




	
	
	
		
 
	epatch "${FILESDIR}"/${P}-sdl-portage-multilib.patch

			




	
	
	
		
 

			




	
	
	
		
 
	AT_M4DIR="m4 ${WORKDIR}/${PN}-m4" eautoreconf

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
src_configure() {

			




	
	
	
		
 

			




	
	
	
		
 
	# It would fail if -fforce-addr is used due to too few registers...

			




        

    


    
    

    

        

                

                    media-video/vlc/vlc-1.0.5.ebuild
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -229,12 +229,15 @@ src_prepare() {

			




	
	
	
		
 
	fi

			




	
	
	
		
 
	# Make it build with libtool 1.5

			




	
	
	
		
 
	rm -f m4/lt* m4/libtool.m4

			




	
	
	
		
 

			




	
	
	
		
 
	has_version '>=net-libs/xulrunner-1.9.2' || EPATCH_EXCLUDE="550_all_xulrunner192.patch"

			




	
	
	
		
 
	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"

			




	
	
	
		
 
	# portage-multilib SDL.h fix

			




	
	
	
		
 
	epatch "${FILESDIR}"/${P}-sdl-portage-multilib.patch

			




	
	
	
		
 

			




	
	
	
		
 
	AT_M4DIR="m4 ${WORKDIR}/${PN}-m4" eautoreconf

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
src_configure() {

			




	
	
	
		
 

			




	
	
	
		
 
	# It would fail if -fforce-addr is used due to too few registers...

			




        

    


    
    

    

        

                

                    media-video/vlc/vlc-1.0.9999.ebuild
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -229,12 +229,15 @@ src_prepare() {

			




	
	
	
		
 
	fi

			




	
	
	
		
 
	# Make it build with libtool 1.5

			




	
	
	
		
 
	rm -f m4/lt* m4/libtool.m4

			




	
	
	
		
 

			




	
	
	
		
 
	has_version '>=net-libs/xulrunner-1.9.2' || EPATCH_EXCLUDE="550_all_xulrunner192.patch"

			




	
	
	
		
 
	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"

			




	
	
	
		
 
	# portage-multilib SDL.h fix

			




	
	
	
		
 
	epatch "${FILESDIR}"/${P}-sdl-portage-multilib.patch

			




	
	
	
		
 

			




	
	
	
		
 
	AT_M4DIR="m4 ${WORKDIR}/${PN}-m4" eautoreconf

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
src_configure() {

			




	
	
	
		
 

			




	
	
	
		
 
	# It would fail if -fforce-addr is used due to too few registers...

			




        

    



    


    



    



      

      





    
    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