multimedia/smpeg: Fix LLD for i386 Log: - Remove included libtool Caused LLD issues - While here regenerate patches Submitted by: Nathan PR: 231524 Index: multimedia/smpeg/Makefile =================================================================== --- multimedia/smpeg/Makefile (revision 480166) +++ multimedia/smpeg/Makefile (working copy) @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes -USES= compiler:features gmake libtool +USES= compiler:features gmake libtool:build USE_SDL= sdl USE_LDCONFIG= yes CONFIGURE_ENV= GLBASE="${LOCALBASE}" \ @@ -23,7 +23,6 @@ SDL_CONFIG="${SDL_CONFIG}" CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= ${COMPILER_FEATURES:Mc++11:C/.+/-Wno-error=narrowing/} - #If you want to try the opengl/gtk player (which doesn't seem to work) #comment out the following line. CONFIGURE_ARGS= --disable-opengl-player \ @@ -30,6 +29,12 @@ --disable-gtk-player \ --enable-mmx +MAKE_ARGS= LDFLAGS=-Wl,-znotext LIBTOOL=${LOCALBASE}/bin/libtool + +post-extract: + ${RM} ${WRKSRC}/libtool ${WRKSRC}/ltconfig + ${TOUCH} ${WRKSRC}/ltconfig + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsmpeg.so Index: multimedia/smpeg/files/patch-MPEGaudio.h =================================================================== --- multimedia/smpeg/files/patch-MPEGaudio.h (revision 480166) +++ multimedia/smpeg/files/patch-MPEGaudio.h (working copy) @@ -1,6 +1,6 @@ ---- MPEGaudio.h Tue Mar 20 13:40:18 2007 -+++ MPEGaudio.h Tue Mar 20 13:43:04 2007 -@@ -148,6 +148,13 @@ +--- MPEGaudio.h.orig 2001-04-04 20:42:40 UTC ++++ MPEGaudio.h +@@ -148,6 +148,13 @@ class Mpegbitwindow (private) char buffer[2*WINDOWSIZE]; }; Index: multimedia/smpeg/files/patch-configure =================================================================== --- multimedia/smpeg/files/patch-configure (revision 480166) +++ multimedia/smpeg/files/patch-configure (working copy) @@ -1,6 +1,6 @@ ---- configure 2002/07/02 12:33:37 1.1 -+++ configure 2002/07/02 12:34:01 -@@ -1055,7 +1055,7 @@ +--- configure.orig 2001-04-24 19:25:46 UTC ++++ configure +@@ -1055,7 +1055,7 @@ cat > conftest.$ac_ext << EOF #line 1056 "configure" #include "confdefs.h" @@ -9,7 +9,7 @@ EOF if { (eval echo configure:1061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes -@@ -2335,6 +2335,7 @@ +@@ -2335,6 +2335,7 @@ rm -f conftest* CFLAGS="$CFLAGS $SDL_CFLAGS" LIBS="$LIBS $SDL_LIBS" Index: multimedia/smpeg/files/patch-gtv.c =================================================================== --- multimedia/smpeg/files/patch-gtv.c (revision 480166) +++ multimedia/smpeg/files/patch-gtv.c (working copy) @@ -1,10 +1,10 @@ ---- gtv.c.orig Sun Mar 26 00:18:54 2000 -+++ gtv.c Sun Mar 26 00:19:17 2000 -@@ -726,6 +726,7 @@ - memset( &info, 0, sizeof( info ) ); +--- gtv.c.orig 2001-04-16 19:08:54 UTC ++++ gtv.c +@@ -963,6 +963,7 @@ int main( int argc, char* argv[] ) memset( &filename_buffer, 0, sizeof( gchar ) * FILENAME_BUFFER_SIZE ); + gtk_set_locale(); gtk_init( &argc, &argv ); + gtk_set_locale (); window = create_gtv_window( ); - gtk_signal_connect( GTK_OBJECT( window ), "destroy", + gtk_drag_dest_set(window, GTK_DEST_DEFAULT_ALL, drop_types, 1, GDK_ACTION_COPY); Index: multimedia/smpeg/files/patch-smpeg.m4 =================================================================== --- multimedia/smpeg/files/patch-smpeg.m4 (revision 480166) +++ multimedia/smpeg/files/patch-smpeg.m4 (working copy) @@ -1,6 +1,6 @@ ---- smpeg.m4.orig 2001-04-05 00:28:14.000000000 +0400 -+++ smpeg.m4 2014-02-14 18:19:27.566113006 +0400 -@@ -10,7 +10,7 @@ +--- smpeg.m4.orig 2001-04-04 20:28:14 UTC ++++ smpeg.m4 +@@ -10,7 +10,7 @@ dnl AM_PATH_SMPEG([MINIMUM-VERSION, [ACTION-IF-FOUND [ ACTION-IF-NOT-FOUND]]]) dnl Test for SMPEG, and define SMPEG_CFLAGS and SMPEG_LIBS dnl Index: multimedia/smpeg/files/patch-video__video.h =================================================================== --- multimedia/smpeg/files/patch-video__video.h (revision 480166) +++ multimedia/smpeg/files/patch-video__video.h (working copy) @@ -1,6 +1,6 @@ ---- video/video.h.orig Sun Feb 8 23:39:25 2004 -+++ video/video.h Sun Feb 8 23:39:36 2004 -@@ -432,7 +432,7 @@ +--- video/video.h.orig 2001-02-10 07:36:42 UTC ++++ video/video.h +@@ -432,7 +432,7 @@ extern unsigned int cacheMiss[8][8]; #undef LITTLE_ENDIAN_ARCHITECTURE #define BIG_ENDIAN_ARCHITECTURE 1 #else