mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-23 00:43:28 +00:00
Update to 0.1.3.
Prompted by: MANY
This commit is contained in:
parent
8b5d6fc1d8
commit
3efbbb7027
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=36128
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= xmps
|
||||
PORTVERSION= 0.1.0
|
||||
PORTVERSION= 0.1.3
|
||||
CATEGORIES= graphics gnome
|
||||
MASTER_SITES= http://xmps.sourceforge.net/sources/
|
||||
|
||||
@ -22,13 +22,10 @@ USE_GNOME= yes
|
||||
USE_LIBTOOL= yes
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
SDL_CONFIG="${SDL_CONFIG}" \
|
||||
LIBS="-L${LOCALBASE}/lib"
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
|
||||
pre-patch:
|
||||
@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
|
||||
s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
|
||||
s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
|
||||
s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
|
||||
@${PERL} -pi -e "s|-lpthread|-pthread|g" ${WRKSRC}/configure
|
||||
@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
|
||||
's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
|
||||
s|\$$\(datadir\)/aclocal|\$$\(prefix\)/share/aclocal|g ; \
|
||||
|
@ -1 +1 @@
|
||||
MD5 (xmps-0.1.0.tar.gz) = 858bc03bc9747516b4135df0be7f7a3c
|
||||
MD5 (xmps-0.1.3.tar.gz) = f56559b59e83e3e5eee518b63d95416c
|
||||
|
@ -1,43 +1,62 @@
|
||||
--- configure.orig Wed May 17 23:43:36 2000
|
||||
+++ configure Thu Jun 15 13:32:11 2000
|
||||
@@ -1536,6 +1536,7 @@
|
||||
|
||||
|
||||
STRETCHER_SRC=
|
||||
+STRETCHER_OBJ=
|
||||
# Extract the first word of "nasm", so it can be a program name with args.
|
||||
set dummy nasm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
@@ -1568,6 +1569,7 @@
|
||||
|
||||
if test "$have_nasm" = "yes"; then
|
||||
STRETCHER_SRC="stretch.h stretch.c stretchblt.asm"
|
||||
+ STRETCHER_OBJ="stretch.lo stretchblt.o"
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define AS_STRETCHER 1
|
||||
--- configure.orig Tue Dec 19 16:40:13 2000
|
||||
+++ configure Tue Dec 19 16:49:08 2000
|
||||
@@ -3803,7 +3803,7 @@
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
-LIBS="-lsmpeg $LIBS"
|
||||
+LIBS="-lsmpeg $SDL_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3809 "configure"
|
||||
#include "confdefs.h"
|
||||
@@ -3833,7 +3833,7 @@
|
||||
#define $ac_tr_lib 1
|
||||
EOF
|
||||
@@ -4060,16 +4062,16 @@
|
||||
|
||||
- LIBS="-lsmpeg $LIBS"
|
||||
+ LIBS="-lsmpeg $SDL_LIBS $LIBS"
|
||||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
@@ -3848,7 +3848,7 @@
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
-LIBS="-lsmpeg $LIBS"
|
||||
+LIBS="-lsmpeg $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3854 "configure"
|
||||
#include "confdefs.h"
|
||||
@@ -3919,7 +3919,7 @@
|
||||
rm -f conftest*
|
||||
echo "$ac_t""$opengl" 1>&6
|
||||
|
||||
-if test x$opengl = xyes; then
|
||||
+if test x$opengl = x"Manually disabled ;)"; then
|
||||
OPENGL=OpenGL
|
||||
CFLAGS="$CFLAGS -DHAVE_OPENGL"
|
||||
GL_LIBS="$X_PRELIBS -lGL -lGLU -lICE -lSM $X_LIBS"
|
||||
@@ -3974,8 +3974,8 @@
|
||||
{ echo "configure: error: **** Cannot find stat.h ****" 1>&2; exit 1; }
|
||||
fi
|
||||
|
||||
-ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'`
|
||||
-echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6
|
||||
-echo "configure:4066: checking for sys/dir.h" >&5
|
||||
+ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
|
||||
+echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
|
||||
+echo "configure:4066: checking for dirent.h" >&5
|
||||
echo "configure:3980: checking for sys/dir.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@@ -3983,7 +3983,7 @@
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4071 "configure"
|
||||
#line 3985 "configure"
|
||||
#include "confdefs.h"
|
||||
-#include <sys/dir.h>
|
||||
+#include <dirent.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:4076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
@@ -4091,7 +4093,7 @@
|
||||
{ (eval echo configure:3990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
@@ -4005,7 +4005,7 @@
|
||||
:
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
@ -46,7 +65,7 @@
|
||||
fi
|
||||
|
||||
|
||||
@@ -6001,7 +6003,7 @@
|
||||
@@ -5915,7 +5915,7 @@
|
||||
< $srcdir/po/POTFILES.in > po/POTFILES
|
||||
|
||||
|
||||
@ -55,11 +74,3 @@
|
||||
|
||||
|
||||
CODEC_PLUGINS_DIR=Codecs
|
||||
@@ -6188,6 +6190,7 @@
|
||||
s%@LIBTOOL@%$LIBTOOL%g
|
||||
s%@have_nasm@%$have_nasm%g
|
||||
s%@STRETCHER_SRC@%$STRETCHER_SRC%g
|
||||
+s%@STRETCHER_OBJ@%$STRETCHER_OBJ%g
|
||||
s%@CPP@%$CPP%g
|
||||
s%@X_CFLAGS@%$X_CFLAGS%g
|
||||
s%@X_PRE_LIBS@%$X_PRE_LIBS%g
|
||||
|
@ -1,43 +1,27 @@
|
||||
--- Output/X11/Makefile.in.orig Wed May 17 23:45:19 2000
|
||||
+++ Output/X11/Makefile.in Thu Jun 15 13:26:45 2000
|
||||
@@ -100,6 +100,7 @@
|
||||
SDL_CONFIG = @SDL_CONFIG@
|
||||
SDL_LIBS = @SDL_LIBS@
|
||||
STRETCHER_SRC = @STRETCHER_SRC@
|
||||
+STRETCHER_OBJ = @STRETCHER_OBJ@
|
||||
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
@@ -115,12 +116,12 @@
|
||||
--- Output/X11/Makefile.in.orig Fri Aug 11 18:02:36 2000
|
||||
+++ Output/X11/Makefile.in Mon Aug 28 16:34:22 2000
|
||||
@@ -121,13 +121,13 @@
|
||||
libdir = $(PLUGINS_DIR)/$(RENDERER_PLUGINS_DIR)
|
||||
|
||||
libX11_la_LDFLAGS = -module -avoid-version
|
||||
-libX11_la_LIBADD = @GTK_LIBS@ -ldl -lXi -lXext -lX11 -lm
|
||||
+libX11_la_LIBADD = @GTK_LIBS@ -lXi -lXext -lX11 -lm
|
||||
-libX11_la_LIBADD = @GTK_LIBS@ -ldl -lXi -lXext -lX11 -lm -L@LIBXMPS_DIR@ -lxmps
|
||||
+libX11_la_LIBADD = @GTK_LIBS@ -lXi -lXext -lX11 -lm -L@LIBXMPS_DIR@ -lxmps
|
||||
|
||||
libX11_la_SOURCES = x11_renderer.c x11_renderer.h @STRETCHER_SRC@
|
||||
libX11_la_SOURCES = x11_renderer.c x11_renderer.h stretch.h stretch.c stretchblt.S
|
||||
|
||||
#mmx.S
|
||||
|
||||
-INCLUDES = @GTK_CFLAGS@
|
||||
+INCLUDES = @GTK_CFLAGS@ @SDL_CFLAGS@
|
||||
-INCLUDES = @GTK_CFLAGS@ -I../../libxmps/ -I../../src
|
||||
+INCLUDES = @GTK_CFLAGS@ @SDL_CFLAGS@ -I../../libxmps/ -I../../src
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_HEADER = ../../config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
@@ -132,7 +133,7 @@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBS = @LIBS@
|
||||
libX11_la_DEPENDENCIES =
|
||||
-libX11_la_OBJECTS = x11_renderer.lo
|
||||
+libX11_la_OBJECTS = x11_renderer.lo @STRETCHER_OBJ@
|
||||
CFLAGS = @CFLAGS@
|
||||
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
@@ -346,6 +347,8 @@
|
||||
@@ -353,6 +353,8 @@
|
||||
distclean-generic clean-generic maintainer-clean-generic clean \
|
||||
mostlyclean distclean maintainer-clean
|
||||
|
||||
+stretchblt.o:
|
||||
+ nasm -f elf stretchblt.asm
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
stretchblt.lo:
|
||||
nasm -f elf -o stretchblt.o stretchblt.S
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- Output/Makefile.in.orig Thu Jun 15 11:44:17 2000
|
||||
+++ Output/Makefile.in Thu Jun 15 11:44:28 2000
|
||||
@@ -111,7 +111,7 @@
|
||||
have_nasm = @have_nasm@
|
||||
l = @l@
|
||||
--- src/types.h 2000/08/30 13:38:31 1.1
|
||||
+++ src/types.h 2000/08/30 13:38:42
|
||||
@@ -26,7 +26,7 @@
|
||||
*/
|
||||
|
||||
-SUBDIRS = SDL X11 OpenGL
|
||||
+SUBDIRS = SDL X11
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_HEADER = ../config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
#include <gtk/gtk.h>
|
||||
-#include <SDL/SDL.h>
|
||||
+#include <SDL.h>
|
||||
#include <pthread.h>
|
||||
|
||||
/* MACROS */
|
||||
|
11
graphics/xmps/files/patch-af
Normal file
11
graphics/xmps/files/patch-af
Normal file
@ -0,0 +1,11 @@
|
||||
--- Output/OpenGL/Makefile.in 2000/08/30 13:40:40 1.1
|
||||
+++ Output/OpenGL/Makefile.in 2000/08/30 13:41:03
|
||||
@@ -126,7 +126,7 @@
|
||||
libopengl_la_SOURCES = opengl_renderer.c opengl_renderer.h
|
||||
|
||||
|
||||
-INCLUDES = @GTK_CFLAGS@ -I../../libxmps -I../../src
|
||||
+INCLUDES = @GTK_CFLAGS@ @SDL_CFLAGS@ -I../../libxmps -I../../src
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_HEADER = ../../config.h
|
||||
CONFIG_CLEAN_FILES =
|
@ -1,9 +1,22 @@
|
||||
bin/xmps
|
||||
bin/xmps-config
|
||||
include/xmps/plugin.h
|
||||
include/xmps/types.h
|
||||
include/xmps/xmps_config.h
|
||||
include/xmps/xmps_message.h
|
||||
include/xmps/xmps_support.h
|
||||
lib/libxmps.so
|
||||
lib/xmps/Codecs/libflx.so
|
||||
lib/xmps/Codecs/libsmpeg.so
|
||||
lib/xmps/Renderers/libSDL.so
|
||||
lib/xmps/Renderers/libX11.so
|
||||
share/aclocal/xmps.m4
|
||||
share/gnome/apps/Multimedia/XMPS.desktop
|
||||
share/gnome/pixmaps/xmps.png
|
||||
share/gnome/xmps/fast_forward.xpm
|
||||
share/gnome/xmps/load.xpm
|
||||
share/gnome/xmps/pause.xpm
|
||||
share/gnome/xmps/play.xpm
|
||||
share/gnome/xmps/rewind.xpm
|
||||
share/gnome/xmps/skins/DarkDepth/buttons.xpm
|
||||
share/gnome/xmps/skins/DarkDepth/config
|
||||
share/gnome/xmps/skins/DarkDepth/controls.xpm
|
||||
@ -18,7 +31,10 @@ share/gnome/xmps/skins/default/digits.xpm
|
||||
share/gnome/xmps/skins/default/main.xpm
|
||||
share/gnome/xmps/skins/default/playlist.xpm
|
||||
share/gnome/xmps/skins/default/titlebar.xpm
|
||||
share/gnome/xmps/stop.xpm
|
||||
share/gnome/xmps/xmps-logo.xpm
|
||||
share/gnome/xmps/xmps_intro.xpm
|
||||
share/locale/de/LC_MESSAGES/xmps.mo
|
||||
share/locale/fi/LC_MESSAGES/xmps.mo
|
||||
share/locale/fr/LC_MESSAGES/xmps.mo
|
||||
share/locale/pl/LC_MESSAGES/xmps.mo
|
||||
@ -30,3 +46,4 @@ share/locale/sv/LC_MESSAGES/xmps.mo
|
||||
@dirrm lib/xmps/Renderers
|
||||
@dirrm lib/xmps/Codecs
|
||||
@dirrm lib/xmps
|
||||
@dirrm include/xmps
|
||||
|
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= xmps
|
||||
PORTVERSION= 0.1.0
|
||||
PORTVERSION= 0.1.3
|
||||
CATEGORIES= graphics gnome
|
||||
MASTER_SITES= http://xmps.sourceforge.net/sources/
|
||||
|
||||
@ -22,13 +22,10 @@ USE_GNOME= yes
|
||||
USE_LIBTOOL= yes
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
SDL_CONFIG="${SDL_CONFIG}" \
|
||||
LIBS="-L${LOCALBASE}/lib"
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
|
||||
pre-patch:
|
||||
@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
|
||||
s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
|
||||
s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
|
||||
s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
|
||||
@${PERL} -pi -e "s|-lpthread|-pthread|g" ${WRKSRC}/configure
|
||||
@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
|
||||
's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
|
||||
s|\$$\(datadir\)/aclocal|\$$\(prefix\)/share/aclocal|g ; \
|
||||
|
@ -1 +1 @@
|
||||
MD5 (xmps-0.1.0.tar.gz) = 858bc03bc9747516b4135df0be7f7a3c
|
||||
MD5 (xmps-0.1.3.tar.gz) = f56559b59e83e3e5eee518b63d95416c
|
||||
|
@ -1,43 +1,62 @@
|
||||
--- configure.orig Wed May 17 23:43:36 2000
|
||||
+++ configure Thu Jun 15 13:32:11 2000
|
||||
@@ -1536,6 +1536,7 @@
|
||||
|
||||
|
||||
STRETCHER_SRC=
|
||||
+STRETCHER_OBJ=
|
||||
# Extract the first word of "nasm", so it can be a program name with args.
|
||||
set dummy nasm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
@@ -1568,6 +1569,7 @@
|
||||
|
||||
if test "$have_nasm" = "yes"; then
|
||||
STRETCHER_SRC="stretch.h stretch.c stretchblt.asm"
|
||||
+ STRETCHER_OBJ="stretch.lo stretchblt.o"
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define AS_STRETCHER 1
|
||||
--- configure.orig Tue Dec 19 16:40:13 2000
|
||||
+++ configure Tue Dec 19 16:49:08 2000
|
||||
@@ -3803,7 +3803,7 @@
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
-LIBS="-lsmpeg $LIBS"
|
||||
+LIBS="-lsmpeg $SDL_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3809 "configure"
|
||||
#include "confdefs.h"
|
||||
@@ -3833,7 +3833,7 @@
|
||||
#define $ac_tr_lib 1
|
||||
EOF
|
||||
@@ -4060,16 +4062,16 @@
|
||||
|
||||
- LIBS="-lsmpeg $LIBS"
|
||||
+ LIBS="-lsmpeg $SDL_LIBS $LIBS"
|
||||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
@@ -3848,7 +3848,7 @@
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
-LIBS="-lsmpeg $LIBS"
|
||||
+LIBS="-lsmpeg $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3854 "configure"
|
||||
#include "confdefs.h"
|
||||
@@ -3919,7 +3919,7 @@
|
||||
rm -f conftest*
|
||||
echo "$ac_t""$opengl" 1>&6
|
||||
|
||||
-if test x$opengl = xyes; then
|
||||
+if test x$opengl = x"Manually disabled ;)"; then
|
||||
OPENGL=OpenGL
|
||||
CFLAGS="$CFLAGS -DHAVE_OPENGL"
|
||||
GL_LIBS="$X_PRELIBS -lGL -lGLU -lICE -lSM $X_LIBS"
|
||||
@@ -3974,8 +3974,8 @@
|
||||
{ echo "configure: error: **** Cannot find stat.h ****" 1>&2; exit 1; }
|
||||
fi
|
||||
|
||||
-ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'`
|
||||
-echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6
|
||||
-echo "configure:4066: checking for sys/dir.h" >&5
|
||||
+ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
|
||||
+echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
|
||||
+echo "configure:4066: checking for dirent.h" >&5
|
||||
echo "configure:3980: checking for sys/dir.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@@ -3983,7 +3983,7 @@
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4071 "configure"
|
||||
#line 3985 "configure"
|
||||
#include "confdefs.h"
|
||||
-#include <sys/dir.h>
|
||||
+#include <dirent.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:4076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
@@ -4091,7 +4093,7 @@
|
||||
{ (eval echo configure:3990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
@@ -4005,7 +4005,7 @@
|
||||
:
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
@ -46,7 +65,7 @@
|
||||
fi
|
||||
|
||||
|
||||
@@ -6001,7 +6003,7 @@
|
||||
@@ -5915,7 +5915,7 @@
|
||||
< $srcdir/po/POTFILES.in > po/POTFILES
|
||||
|
||||
|
||||
@ -55,11 +74,3 @@
|
||||
|
||||
|
||||
CODEC_PLUGINS_DIR=Codecs
|
||||
@@ -6188,6 +6190,7 @@
|
||||
s%@LIBTOOL@%$LIBTOOL%g
|
||||
s%@have_nasm@%$have_nasm%g
|
||||
s%@STRETCHER_SRC@%$STRETCHER_SRC%g
|
||||
+s%@STRETCHER_OBJ@%$STRETCHER_OBJ%g
|
||||
s%@CPP@%$CPP%g
|
||||
s%@X_CFLAGS@%$X_CFLAGS%g
|
||||
s%@X_PRE_LIBS@%$X_PRE_LIBS%g
|
||||
|
@ -1,43 +1,27 @@
|
||||
--- Output/X11/Makefile.in.orig Wed May 17 23:45:19 2000
|
||||
+++ Output/X11/Makefile.in Thu Jun 15 13:26:45 2000
|
||||
@@ -100,6 +100,7 @@
|
||||
SDL_CONFIG = @SDL_CONFIG@
|
||||
SDL_LIBS = @SDL_LIBS@
|
||||
STRETCHER_SRC = @STRETCHER_SRC@
|
||||
+STRETCHER_OBJ = @STRETCHER_OBJ@
|
||||
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
@@ -115,12 +116,12 @@
|
||||
--- Output/X11/Makefile.in.orig Fri Aug 11 18:02:36 2000
|
||||
+++ Output/X11/Makefile.in Mon Aug 28 16:34:22 2000
|
||||
@@ -121,13 +121,13 @@
|
||||
libdir = $(PLUGINS_DIR)/$(RENDERER_PLUGINS_DIR)
|
||||
|
||||
libX11_la_LDFLAGS = -module -avoid-version
|
||||
-libX11_la_LIBADD = @GTK_LIBS@ -ldl -lXi -lXext -lX11 -lm
|
||||
+libX11_la_LIBADD = @GTK_LIBS@ -lXi -lXext -lX11 -lm
|
||||
-libX11_la_LIBADD = @GTK_LIBS@ -ldl -lXi -lXext -lX11 -lm -L@LIBXMPS_DIR@ -lxmps
|
||||
+libX11_la_LIBADD = @GTK_LIBS@ -lXi -lXext -lX11 -lm -L@LIBXMPS_DIR@ -lxmps
|
||||
|
||||
libX11_la_SOURCES = x11_renderer.c x11_renderer.h @STRETCHER_SRC@
|
||||
libX11_la_SOURCES = x11_renderer.c x11_renderer.h stretch.h stretch.c stretchblt.S
|
||||
|
||||
#mmx.S
|
||||
|
||||
-INCLUDES = @GTK_CFLAGS@
|
||||
+INCLUDES = @GTK_CFLAGS@ @SDL_CFLAGS@
|
||||
-INCLUDES = @GTK_CFLAGS@ -I../../libxmps/ -I../../src
|
||||
+INCLUDES = @GTK_CFLAGS@ @SDL_CFLAGS@ -I../../libxmps/ -I../../src
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_HEADER = ../../config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
@@ -132,7 +133,7 @@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBS = @LIBS@
|
||||
libX11_la_DEPENDENCIES =
|
||||
-libX11_la_OBJECTS = x11_renderer.lo
|
||||
+libX11_la_OBJECTS = x11_renderer.lo @STRETCHER_OBJ@
|
||||
CFLAGS = @CFLAGS@
|
||||
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
@@ -346,6 +347,8 @@
|
||||
@@ -353,6 +353,8 @@
|
||||
distclean-generic clean-generic maintainer-clean-generic clean \
|
||||
mostlyclean distclean maintainer-clean
|
||||
|
||||
+stretchblt.o:
|
||||
+ nasm -f elf stretchblt.asm
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
stretchblt.lo:
|
||||
nasm -f elf -o stretchblt.o stretchblt.S
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- Output/Makefile.in.orig Thu Jun 15 11:44:17 2000
|
||||
+++ Output/Makefile.in Thu Jun 15 11:44:28 2000
|
||||
@@ -111,7 +111,7 @@
|
||||
have_nasm = @have_nasm@
|
||||
l = @l@
|
||||
--- src/types.h 2000/08/30 13:38:31 1.1
|
||||
+++ src/types.h 2000/08/30 13:38:42
|
||||
@@ -26,7 +26,7 @@
|
||||
*/
|
||||
|
||||
-SUBDIRS = SDL X11 OpenGL
|
||||
+SUBDIRS = SDL X11
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_HEADER = ../config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
#include <gtk/gtk.h>
|
||||
-#include <SDL/SDL.h>
|
||||
+#include <SDL.h>
|
||||
#include <pthread.h>
|
||||
|
||||
/* MACROS */
|
||||
|
11
multimedia/xmps/files/patch-af
Normal file
11
multimedia/xmps/files/patch-af
Normal file
@ -0,0 +1,11 @@
|
||||
--- Output/OpenGL/Makefile.in 2000/08/30 13:40:40 1.1
|
||||
+++ Output/OpenGL/Makefile.in 2000/08/30 13:41:03
|
||||
@@ -126,7 +126,7 @@
|
||||
libopengl_la_SOURCES = opengl_renderer.c opengl_renderer.h
|
||||
|
||||
|
||||
-INCLUDES = @GTK_CFLAGS@ -I../../libxmps -I../../src
|
||||
+INCLUDES = @GTK_CFLAGS@ @SDL_CFLAGS@ -I../../libxmps -I../../src
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_HEADER = ../../config.h
|
||||
CONFIG_CLEAN_FILES =
|
@ -1,9 +1,22 @@
|
||||
bin/xmps
|
||||
bin/xmps-config
|
||||
include/xmps/plugin.h
|
||||
include/xmps/types.h
|
||||
include/xmps/xmps_config.h
|
||||
include/xmps/xmps_message.h
|
||||
include/xmps/xmps_support.h
|
||||
lib/libxmps.so
|
||||
lib/xmps/Codecs/libflx.so
|
||||
lib/xmps/Codecs/libsmpeg.so
|
||||
lib/xmps/Renderers/libSDL.so
|
||||
lib/xmps/Renderers/libX11.so
|
||||
share/aclocal/xmps.m4
|
||||
share/gnome/apps/Multimedia/XMPS.desktop
|
||||
share/gnome/pixmaps/xmps.png
|
||||
share/gnome/xmps/fast_forward.xpm
|
||||
share/gnome/xmps/load.xpm
|
||||
share/gnome/xmps/pause.xpm
|
||||
share/gnome/xmps/play.xpm
|
||||
share/gnome/xmps/rewind.xpm
|
||||
share/gnome/xmps/skins/DarkDepth/buttons.xpm
|
||||
share/gnome/xmps/skins/DarkDepth/config
|
||||
share/gnome/xmps/skins/DarkDepth/controls.xpm
|
||||
@ -18,7 +31,10 @@ share/gnome/xmps/skins/default/digits.xpm
|
||||
share/gnome/xmps/skins/default/main.xpm
|
||||
share/gnome/xmps/skins/default/playlist.xpm
|
||||
share/gnome/xmps/skins/default/titlebar.xpm
|
||||
share/gnome/xmps/stop.xpm
|
||||
share/gnome/xmps/xmps-logo.xpm
|
||||
share/gnome/xmps/xmps_intro.xpm
|
||||
share/locale/de/LC_MESSAGES/xmps.mo
|
||||
share/locale/fi/LC_MESSAGES/xmps.mo
|
||||
share/locale/fr/LC_MESSAGES/xmps.mo
|
||||
share/locale/pl/LC_MESSAGES/xmps.mo
|
||||
@ -30,3 +46,4 @@ share/locale/sv/LC_MESSAGES/xmps.mo
|
||||
@dirrm lib/xmps/Renderers
|
||||
@dirrm lib/xmps/Codecs
|
||||
@dirrm lib/xmps
|
||||
@dirrm include/xmps
|
||||
|
Loading…
Reference in New Issue
Block a user