View | Details | Raw Unified | Return to bug 231524 | Differences between
and this patch

Collapse All | Expand All

(-)multimedia/smpeg/Makefile (-7 / +6 lines)
Lines 15-36 Link Here
15
LICENSE_FILE=	${WRKSRC}/COPYING
15
LICENSE_FILE=	${WRKSRC}/COPYING
16
16
17
GNU_CONFIGURE=	yes
17
GNU_CONFIGURE=	yes
18
USES=		compiler:features gmake libtool
18
USES=		gmake libtool:build
19
USE_SDL=	sdl
19
USE_SDL=	sdl
20
USE_LDCONFIG=	yes
20
USE_LDCONFIG=	yes
21
CONFIGURE_ENV=	GLBASE="${LOCALBASE}" \
21
CONFIGURE_ENV=	GLBASE="${LOCALBASE}" \
22
		CC="${CXX}" REAL_CC="${CC}" \
22
		CC="${CXX}" REAL_CC="${CC}" \
23
		SDL_CONFIG="${SDL_CONFIG}"
23
		SDL_CONFIG="${SDL_CONFIG}"
24
CPPFLAGS+=	-I${LOCALBASE}/include
25
CFLAGS+=	${COMPILER_FEATURES:Mc++11:C/.+/-Wno-error=narrowing/}
26
27
#If you want to try the opengl/gtk player (which doesn't seem to work)
24
#If you want to try the opengl/gtk player (which doesn't seem to work)
28
#comment out the following line.
25
#comment out the following line.
29
CONFIGURE_ARGS=	--disable-opengl-player \
26
CONFIGURE_ARGS=	--disable-opengl-player \
30
		--disable-gtk-player \
27
		--disable-gtk-player \
31
		--enable-mmx
28
		--enable-mmx
29
CFLAGS=	-Wno-error-narrowing
30
LDFLAGS_i386=	-Wl,-znotext
31
LDFLAGS=	${LDFLAGS_${ARCH}}
32
MAKE_ARGS=	LIBTOOL=${LOCALBASE}/bin/libtool
33
INSTALL_TARGET=install-strip
32
34
33
post-install:
34
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsmpeg.so
35
36
.include <bsd.port.mk>
35
.include <bsd.port.mk>
(-)multimedia/smpeg/files/patch-MPEGaudio.h (-3 / +3 lines)
Lines 1-6 Link Here
1
--- MPEGaudio.h	Tue Mar 20 13:40:18 2007
1
--- MPEGaudio.h.orig	2001-04-04 20:42:40 UTC
2
+++ MPEGaudio.h	Tue Mar 20 13:43:04 2007
2
+++ MPEGaudio.h
3
@@ -148,6 +148,13 @@
3
@@ -148,6 +148,13 @@ class Mpegbitwindow (private)
4
   char buffer[2*WINDOWSIZE];
4
   char buffer[2*WINDOWSIZE];
5
 };
5
 };
6
 
6
 
(-)multimedia/smpeg/files/patch-configure (-4 / +30 lines)
Lines 1-6 Link Here
1
--- configure	2002/07/02 12:33:37	1.1
1
--- configure.orig	2001-04-24 19:25:46 UTC
2
+++ configure	2002/07/02 12:34:01
2
+++ configure
3
@@ -1055,7 +1055,7 @@
3
@@ -58,7 +58,6 @@ ac_help="$ac_help
4
 # The variables have the same names as the options, with
5
 # dashes changed to underlines.
6
 build=NONE
7
-cache_file=./config.cache
8
 exec_prefix=NONE
9
 host=NONE
10
 no_create=
11
@@ -1055,7 +1054,7 @@ cat > conftest.$ac_ext << EOF
4
 #line 1056 "configure"
12
 #line 1056 "configure"
5
 #include "confdefs.h"
13
 #include "confdefs.h"
6
 
14
 
Lines 9-16 Link Here
9
 EOF
17
 EOF
10
 if { (eval echo configure:1061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
18
 if { (eval echo configure:1061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11
   ac_cv_prog_cc_works=yes
19
   ac_cv_prog_cc_works=yes
12
@@ -2335,6 +2335,7 @@
20
@@ -1850,7 +1849,7 @@ esac
13
 
21
 
22
 
23
 # Save cache, so that ltconfig can load it
24
-cat > confcache <<\EOF
25
+<<\EOF
26
 # This file is a shell script that caches the results of configure
27
 # tests run on this system so they can be shared between configure
28
 # scripts and configure runs.  It is not useful on other systems.
29
@@ -1903,8 +1902,6 @@ CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
30
 LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
31
 LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
32
 DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
33
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
34
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
35
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
36
 
37
 # Reload cache, that may have been modified by ltconfig
38
@@ -2335,6 +2332,7 @@ rm -f conftest*
39
 
14
 CFLAGS="$CFLAGS $SDL_CFLAGS"
40
 CFLAGS="$CFLAGS $SDL_CFLAGS"
15
 LIBS="$LIBS $SDL_LIBS"
41
 LIBS="$LIBS $SDL_LIBS"
16
+CC="$REAL_CC"
42
+CC="$REAL_CC"
(-)multimedia/smpeg/files/patch-gtv.c (-5 / +5 lines)
Lines 1-10 Link Here
1
--- gtv.c.orig	Sun Mar 26 00:18:54 2000
1
--- gtv.c.orig	2001-04-16 19:08:54 UTC
2
+++ gtv.c	Sun Mar 26 00:19:17 2000
2
+++ gtv.c
3
@@ -726,6 +726,7 @@
3
@@ -963,6 +963,7 @@ int main( int argc, char* argv[] )
4
     memset( &info, 0, sizeof( info ) );
5
     memset( &filename_buffer, 0, sizeof( gchar ) * FILENAME_BUFFER_SIZE );
4
     memset( &filename_buffer, 0, sizeof( gchar ) * FILENAME_BUFFER_SIZE );
5
     gtk_set_locale();
6
     gtk_init( &argc, &argv );
6
     gtk_init( &argc, &argv );
7
+    gtk_set_locale ();
7
+    gtk_set_locale ();
8
 
8
 
9
     window = create_gtv_window( );
9
     window = create_gtv_window( );
10
     gtk_signal_connect( GTK_OBJECT( window ), "destroy",
10
     gtk_drag_dest_set(window, GTK_DEST_DEFAULT_ALL, drop_types, 1, GDK_ACTION_COPY);
(-)multimedia/smpeg/files/patch-smpeg.m4 (-3 / +3 lines)
Lines 1-6 Link Here
1
--- smpeg.m4.orig	2001-04-05 00:28:14.000000000 +0400
1
--- smpeg.m4.orig	2001-04-04 20:28:14 UTC
2
+++ smpeg.m4	2014-02-14 18:19:27.566113006 +0400
2
+++ smpeg.m4
3
@@ -10,7 +10,7 @@
3
@@ -10,7 +10,7 @@ dnl AM_PATH_SMPEG([MINIMUM-VERSION, [ACTION-IF-FOUND [
4
 ACTION-IF-NOT-FOUND]]])
4
 ACTION-IF-NOT-FOUND]]])
5
 dnl Test for SMPEG, and define SMPEG_CFLAGS and SMPEG_LIBS
5
 dnl Test for SMPEG, and define SMPEG_CFLAGS and SMPEG_LIBS
6
 dnl
6
 dnl
(-)multimedia/smpeg/files/patch-video__video.h (-3 / +3 lines)
Lines 1-6 Link Here
1
--- video/video.h.orig	Sun Feb  8 23:39:25 2004
1
--- video/video.h.orig	2001-02-10 07:36:42 UTC
2
+++ video/video.h	Sun Feb  8 23:39:36 2004
2
+++ video/video.h
3
@@ -432,7 +432,7 @@
3
@@ -432,7 +432,7 @@ extern unsigned int cacheMiss[8][8];
4
 #undef  LITTLE_ENDIAN_ARCHITECTURE
4
 #undef  LITTLE_ENDIAN_ARCHITECTURE
5
 #define BIG_ENDIAN_ARCHITECTURE 1
5
 #define BIG_ENDIAN_ARCHITECTURE 1
6
 #else
6
 #else

Return to bug 231524