mr_bones_ 15/02/22 07:51:44 Modified: smpeg2-2.0.0-smpeg2-config.patch Log: add the patch from smpeg to work around bug #538876; rev bump to push out diffs (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.2 media-libs/smpeg2/files/smpeg2-2.0.0-smpeg2-config.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/smpeg2/files/smpeg2-2.0.0-smpeg2-config.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/smpeg2/files/smpeg2-2.0.0-smpeg2-config.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/smpeg2/files/smpeg2-2.0.0-smpeg2-config.patch?r1=1.1&r2=1.2 Index: smpeg2-2.0.0-smpeg2-config.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/smpeg2/files/smpeg2-2.0.0-smpeg2-config.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- smpeg2-2.0.0-smpeg2-config.patch 7 Oct 2013 15:36:12 -0000 1.1 +++ smpeg2-2.0.0-smpeg2-config.patch 22 Feb 2015 07:51:44 -0000 1.2 @@ -4,9 +4,14 @@ SDL_CONFIG is now SDL2_CONFIG in the new sdl2.m4 ---- smpeg-2.0.0/smpeg2-config.in +--------------------------------------CUT--------------------------------------- +also + +Only dump -L/-rpath if libdir is non-standard; cribbed from smpeg patches + +--- smpeg-2.0.0.orig/smpeg2-config.in +++ smpeg-2.0.0/smpeg2-config.in -@@ -42,7 +42,7 @@ +@@ -42,15 +42,17 @@ if test @includedir@ != /usr/include ; then includes=-I@includedir@ fi @@ -14,14 +19,15 @@ + echo $includes -I@includedir@/smpeg2 `@SDL2_CONFIG@ --cflags` ;; --libs) ++ if [ "@libdir@" != "/usr/lib" ]; then if [ "`uname`" = "SunOS" ]; then -@@ -50,7 +50,7 @@ + libdirs="-L@libdir@ -R@libdir@" else libdirs="-L@libdir@ @SMPEG_RLD_FLAGS@" fi - echo $libdirs -lsmpeg2 `@SDL_CONFIG@ --libs` ++ fi + echo $libdirs -lsmpeg2 `@SDL2_CONFIG@ --libs` ;; *) echo "${usage}" 1>&2 -
