diff options
44 files changed, 538 insertions, 284 deletions
diff --git a/graphics/xmps/Makefile b/graphics/xmps/Makefile index c7de3378445a..53898ffda91c 100644 --- a/graphics/xmps/Makefile +++ b/graphics/xmps/Makefile @@ -6,19 +6,17 @@ # PORTNAME= xmps -PORTVERSION= 0.1.3 +PORTVERSION= 0.2.0 CATEGORIES= graphics gnome MASTER_SITES= http://xmps.sourceforge.net/sources/ MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= smpeg.1:${PORTSDIR}/graphics/smpeg -BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm - SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config USE_X_PREFIX= yes USE_GNOME= yes +INSTALLS_SHLIB= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ SDL_CONFIG="${SDL_CONFIG}" \ @@ -29,7 +27,8 @@ pre-patch: @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ s|\$$\(datadir\)/aclocal|\$$\(prefix\)/share/aclocal|g ; \ - s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g ; \ + s|-lpthread|-pthread|g' post-configure: @${PERL} -pi -e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \ diff --git a/graphics/xmps/distinfo b/graphics/xmps/distinfo index bc9d8b9e5b3b..17427f68a542 100644 --- a/graphics/xmps/distinfo +++ b/graphics/xmps/distinfo @@ -1 +1 @@ -MD5 (xmps-0.1.3.tar.gz) = f56559b59e83e3e5eee518b63d95416c +MD5 (xmps-0.2.0.tar.gz) = 87937db0d26e599003f0e8db4284e16b diff --git a/graphics/xmps/files/patch-aa b/graphics/xmps/files/patch-aa index c859c119338c..baaab7875043 100644 --- a/graphics/xmps/files/patch-aa +++ b/graphics/xmps/files/patch-aa @@ -1,62 +1,30 @@ ---- 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 - -- 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 @@ + +$FreeBSD$ + +--- configure.orig Sun Feb 4 21:49:31 2001 ++++ configure Sun Feb 4 21:52:15 2001 +@@ -3694,16 +3694,16 @@ { 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:3700: 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:3980: checking for sys/dir.h" >&5 ++echo "configure:3700: checking for dirent.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3983,7 +3983,7 @@ + else cat > conftest.$ac_ext <<EOF - #line 3985 "configure" + #line 3705 "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:3990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -4005,7 +4005,7 @@ + { (eval echo configure:3710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +@@ -3725,7 +3725,7 @@ : else echo "$ac_t""no" 1>&6 @@ -65,12 +33,12 @@ fi -@@ -5915,7 +5915,7 @@ +@@ -5636,7 +5636,7 @@ < $srcdir/po/POTFILES.in > po/POTFILES --CFLAGS="$CFLAGS `gtk-config --cflags`" -+CFLAGS="$CFLAGS `$GTK_CONFIG --cflags`" +-CFLAGS="$CFLAGS `gtk-config --cflags` -Wall -Werror" ++CFLAGS="$CFLAGS `$GTK_CONFIG --cflags` -Wall -Werror" - CODEC_PLUGINS_DIR=Codecs + VIDEO_ADDON_PLUGIN_DIR=addons/video diff --git a/graphics/xmps/files/patch-ab b/graphics/xmps/files/patch-ab index 270474988096..aca750600a37 100644 --- a/graphics/xmps/files/patch-ab +++ b/graphics/xmps/files/patch-ab @@ -1,11 +1,11 @@ ---- Output/SDL/sdl_renderer.h.orig Thu Jun 15 11:33:24 2000 -+++ Output/SDL/sdl_renderer.h Thu Jun 15 11:33:35 2000 -@@ -25,7 +25,7 @@ - #ifndef _SDL_RENDERER_H - #define _SDL_RENDERER_H +--- renderers/video/sdl/sdl_renderer.h 2001/02/04 19:53:13 1.1 ++++ renderers/video/sdl/sdl_renderer.h 2001/02/04 19:53:23 +@@ -40,7 +40,7 @@ + * + */ -#include <SDL/SDL.h> +#include <SDL.h> - #include <src/types.h> - #include <src/xmps_utils.h> + #include "libxmps/libxmps.h" + diff --git a/graphics/xmps/files/patch-ac b/graphics/xmps/files/patch-ac deleted file mode 100644 index fc6db3042567..000000000000 --- a/graphics/xmps/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- Output/X11/stretch.h.orig Thu Jun 15 11:36:00 2000 -+++ Output/X11/stretch.h Thu Jun 15 11:36:11 2000 -@@ -27,7 +27,7 @@ - #ifndef _STRETCH_H - #define _STRETCH_H - --#include <SDL/SDL.h> -+#include <SDL.h> - - /* setup scaling routine. must be called before AS_stretchBlit - Returns 0 on success, nonzero if bit depth is invalid (not 16 nor 32), diff --git a/graphics/xmps/files/patch-ad b/graphics/xmps/files/patch-ad deleted file mode 100644 index 1788b62013d0..000000000000 --- a/graphics/xmps/files/patch-ad +++ /dev/null @@ -1,27 +0,0 @@ ---- 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 -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 stretch.h stretch.c stretchblt.S - - #mmx.S - --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 = -@@ -353,6 +353,8 @@ - distclean-generic clean-generic maintainer-clean-generic clean \ - mostlyclean distclean maintainer-clean - -+stretchblt.o: -+ nasm -f elf stretchblt.asm - - stretchblt.lo: - nasm -f elf -o stretchblt.o stretchblt.S diff --git a/graphics/xmps/files/patch-ae b/graphics/xmps/files/patch-ae deleted file mode 100644 index 1f2e2ac7b29b..000000000000 --- a/graphics/xmps/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- src/types.h 2000/08/30 13:38:31 1.1 -+++ src/types.h 2000/08/30 13:38:42 -@@ -26,7 +26,7 @@ - */ - - #include <gtk/gtk.h> --#include <SDL/SDL.h> -+#include <SDL.h> - #include <pthread.h> - - /* MACROS */ diff --git a/graphics/xmps/files/patch-af b/graphics/xmps/files/patch-af deleted file mode 100644 index b86e6fff559f..000000000000 --- a/graphics/xmps/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 = diff --git a/graphics/xmps/files/patch-codecs::audio::ac3::ac3_codec.c b/graphics/xmps/files/patch-codecs::audio::ac3::ac3_codec.c new file mode 100644 index 000000000000..a7c921fe63b2 --- /dev/null +++ b/graphics/xmps/files/patch-codecs::audio::ac3::ac3_codec.c @@ -0,0 +1,50 @@ + +$FreeBSD$ + +--- codecs/audio/ac3/ac3_codec.c.orig Mon Nov 20 21:41:18 2000 ++++ codecs/audio/ac3/ac3_codec.c Sun Feb 4 23:18:46 2001 +@@ -60,7 +60,7 @@ + + } ac3_t; + +-int error; ++int ac3_error; + + /* + * get_audio_codec_info : MANDATORY +@@ -96,7 +96,7 @@ + ((ac3_t *) audio_decoder->data)->smixlev_lut[2] = 0.0; + ((ac3_t *) audio_decoder->data)->smixlev_lut[3] = 0.500; + +- error = 0; ++ ac3_error = 0; + + return audio_decoder; + } +@@ -208,7 +208,7 @@ + + exponent_unpack(&data->bsi, &data->audblk); + +- if(error) ++ if(ac3_error) + goto error; + + // Figure out how many bits per mantissa +@@ -220,7 +220,7 @@ + + coeff_unpack (&data->bsi, &data->audblk, data->samples); + +- if(error) ++ if(ac3_error) + goto error; + + if(data->bsi.acmod == 0x2) +@@ -242,7 +242,7 @@ + memset(data->s16_samples, 0, 256*2*2*6); + ring_write((char *) data->s16_samples, 256*2*2*6); + +- error = 0; ++ ac3_error = 0; + + } + diff --git a/graphics/xmps/files/patch-codecs::audio::ac3::coeff.c b/graphics/xmps/files/patch-codecs::audio::ac3::coeff.c new file mode 100644 index 000000000000..9f2576ac8fc7 --- /dev/null +++ b/graphics/xmps/files/patch-codecs::audio::ac3::coeff.c @@ -0,0 +1,23 @@ + +$FreeBSD$ + +--- codecs/audio/ac3/coeff.c 2001/02/04 21:17:23 1.1 ++++ codecs/audio/ac3/coeff.c 2001/02/04 21:17:55 +@@ -254,7 +254,7 @@ + 11, 12, 14, 16 + }; + +-extern int error; ++extern int ac3_error; + + static void coeff_reset(void); + static float coeff_get_float(uint16_t bap, uint16_t dithflag, uint16_t exp); +@@ -370,7 +370,7 @@ + + error: + XMPS_DEBUG("** Invalid mantissa - skipping frame **"); +- error = 1; ++ ac3_error = 1; + + return 0.0; + } diff --git a/graphics/xmps/files/patch-codecs::audio::ac3::exponent.c b/graphics/xmps/files/patch-codecs::audio::ac3::exponent.c new file mode 100644 index 000000000000..e629e1847969 --- /dev/null +++ b/graphics/xmps/files/patch-codecs::audio::ac3::exponent.c @@ -0,0 +1,22 @@ + +$FreeBSD$ + +--- codecs/audio/ac3/exponent.c 2001/02/04 21:17:23 1.1 ++++ codecs/audio/ac3/exponent.c 2001/02/04 21:18:06 +@@ -30,7 +30,7 @@ + + #include "exponent.h" + +-extern int error; ++extern int ac3_error; + + static inline void exp_unpack_ch(uint16_t type,uint16_t expstr,uint16_t ngrps,uint16_t initial_exp, uint16_t exps[], uint16_t *dest); + +@@ -126,6 +126,6 @@ + return; + error: + fprintf (stderr,"** Invalid exponent - skipping frame **\n"); +- error = 1; ++ ac3_error = 1; + } + diff --git a/graphics/xmps/files/patch-codecs::video::flx::Makefile.in b/graphics/xmps/files/patch-codecs::video::flx::Makefile.in new file mode 100644 index 000000000000..5746825836c5 --- /dev/null +++ b/graphics/xmps/files/patch-codecs::video::flx::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- codecs/video/flx/Makefile.in.orig Sat Jan 20 01:53:42 2001 ++++ codecs/video/flx/Makefile.in Sun Feb 4 22:55:34 2001 +@@ -125,7 +125,7 @@ + libflx_la_SOURCES = flx_codec.h flx_codec.c + + +-INCLUDES = @CFLAGS@ -DVERSION=\"@VERSION@\" -DPACKAGE=\"@PACKAGE@\" -I$(includedir) -I$(top_srcdir)/src -I$(top_srcdir)/libxmps -I$(top_srcdir)/intl -I../../src -I../../libxmps -Wall ++INCLUDES = @CFLAGS@ @SDL_CFLAGS@ -DVERSION=\"@VERSION@\" -DPACKAGE=\"@PACKAGE@\" -I$(includedir) -I$(top_srcdir)/src -I$(top_srcdir)/libxmps -I$(top_srcdir)/intl -I../../src -I../../libxmps -Wall + + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h diff --git a/graphics/xmps/files/patch-codecs::video::flx::flx_codec.h b/graphics/xmps/files/patch-codecs::video::flx::flx_codec.h new file mode 100644 index 000000000000..bedd02f21154 --- /dev/null +++ b/graphics/xmps/files/patch-codecs::video::flx::flx_codec.h @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- codecs/video/flx/flx_codec.h.orig Wed Nov 1 20:46:14 2000 ++++ codecs/video/flx/flx_codec.h Sun Feb 4 22:55:34 2001 +@@ -52,7 +52,7 @@ + #include <stdlib.h> + #include <string.h> + #include <unistd.h> +-#include <SDL/SDL.h> ++#include <SDL.h> + + typedef struct { + diff --git a/graphics/xmps/files/patch-gui::skinned::xmps_skin_browser.h b/graphics/xmps/files/patch-gui::skinned::xmps_skin_browser.h new file mode 100644 index 000000000000..c1a1fdae736e --- /dev/null +++ b/graphics/xmps/files/patch-gui::skinned::xmps_skin_browser.h @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- gui/skinned/xmps_skin_browser.h.orig Thu Nov 23 16:06:40 2000 ++++ gui/skinned/xmps_skin_browser.h Sun Feb 4 22:55:34 2001 +@@ -36,7 +36,7 @@ + /* INCLUDES */ + + #include <gtk/gtk.h> +-#include <sys/dir.h> ++#include <dirent.h> + #include <sys/stat.h> + #include "libxmps/libxmps.h" + #include "libxmpsutils/libxmpsutils.h" diff --git a/graphics/xmps/files/patch-libxmps::Makefile.in b/graphics/xmps/files/patch-libxmps::Makefile.in new file mode 100644 index 000000000000..c88117b1482b --- /dev/null +++ b/graphics/xmps/files/patch-libxmps::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- libxmps/Makefile.in.orig Sun Feb 4 23:01:50 2001 ++++ libxmps/Makefile.in Sun Feb 4 23:02:33 2001 +@@ -120,7 +120,7 @@ + + libxmpsincludedir = $(includedir)/libxmps + +-libxmps_la_LDFLAGS = -module -avoid-version ++libxmps_la_LDFLAGS = -module + libxmps_la_LIBADD = -pthread + + libxmps_la_SOURCES = libxmps_config.h libxmps_config.c libxmps_graph.c libxmps_events.c libxmps_video_conversion.c libxmps_xml.c libxmps.h libxmps.c diff --git a/graphics/xmps/files/patch-libxmpsutils::Makefile.in b/graphics/xmps/files/patch-libxmpsutils::Makefile.in new file mode 100644 index 000000000000..4810f38c24df --- /dev/null +++ b/graphics/xmps/files/patch-libxmpsutils::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- libxmpsutils/Makefile.in 2001/02/04 21:00:58 1.1 ++++ libxmpsutils/Makefile.in 2001/02/04 21:01:11 +@@ -118,7 +118,7 @@ + + lib_LTLIBRARIES = libxmpsutils.la + +-libxmpsutils_la_LDFLAGS = -module -avoid-version ++libxmpsutils_la_LDFLAGS = -module + libxmpsutils_la_LIBADD = @GTK_LIBS@ + + libxmpsutils_la_SOURCES = xmps_support.c xmps_support.h xmps_i18n.h xmps_message.h xmps_message.c xmps_item.h xmps_item.c xmps_menu.h xmps_menu.c xmps_playlist.h xmps_playlist.c xmps_file_info.h xmps_file_info.c xmps_gtk_config.h xmps_gtk_config.c xmps_about.c xmps_utils.h xmps_utils.c libxmpsutils.h diff --git a/graphics/xmps/files/patch-renderers::audio::sdl::sdl_audio_renderer.h b/graphics/xmps/files/patch-renderers::audio::sdl::sdl_audio_renderer.h new file mode 100644 index 000000000000..44e9c9aaac45 --- /dev/null +++ b/graphics/xmps/files/patch-renderers::audio::sdl::sdl_audio_renderer.h @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- renderers/audio/sdl/sdl_audio_renderer.h.orig Fri Nov 3 21:41:37 2000 ++++ renderers/audio/sdl/sdl_audio_renderer.h Sun Feb 4 22:55:34 2001 +@@ -34,7 +34,7 @@ + + #include "libxmps/libxmps.h" + +-#include <SDL/SDL.h> ++#include <SDL.h> + #include <string.h> + + #ifdef HAVE_CONFIG_H diff --git a/graphics/xmps/files/patch-src::Makefile.in b/graphics/xmps/files/patch-src::Makefile.in new file mode 100644 index 000000000000..53d416227753 --- /dev/null +++ b/graphics/xmps/files/patch-src::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- src/Makefile.in.orig Sat Jan 20 01:53:55 2001 ++++ src/Makefile.in Sun Feb 4 22:55:34 2001 +@@ -126,7 +126,7 @@ + xmps_SOURCES = main.c + + +-xmps_LDADD = -L@LIBXMPS_DIR@ -lxmps -L@LIBXMPSUTILS_DIR@ -lxmpsutils ++xmps_LDADD = -L@LIBXMPS_DIR@ -lxmps -L@LIBXMPSUTILS_DIR@ -lxmpsutils -pthread + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = diff --git a/graphics/xmps/files/patch-system::mpeg3::mpeg3io.c b/graphics/xmps/files/patch-system::mpeg3::mpeg3io.c new file mode 100644 index 000000000000..ebc186470bf0 --- /dev/null +++ b/graphics/xmps/files/patch-system::mpeg3::mpeg3io.c @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- system/mpeg3/mpeg3io.c.orig Fri Nov 3 21:41:37 2000 ++++ system/mpeg3/mpeg3io.c Sun Feb 4 22:55:34 2001 +@@ -20,7 +20,6 @@ + #include "mpeg3protos.h" + + #include <stdio.h> +-#include <mntent.h> + #include <sys/stat.h> + #include <stdlib.h> + #include <string.h> diff --git a/graphics/xmps/pkg-comment b/graphics/xmps/pkg-comment index f4d8e4a417eb..96525f843919 100644 --- a/graphics/xmps/pkg-comment +++ b/graphics/xmps/pkg-comment @@ -1 +1 @@ -X MPEG Player System - a MPEG-1 video player with a very nice GUI +X MPEG Player System - a media player with a very nice GUI diff --git a/graphics/xmps/pkg-descr b/graphics/xmps/pkg-descr index f3122b9dae59..8cb286dc4362 100644 --- a/graphics/xmps/pkg-descr +++ b/graphics/xmps/pkg-descr @@ -1,11 +1,5 @@ XMPS stands for X MPEG Player System. It's a simple Gtk program that will -(hopefully) play MPEG-1 files with sound under the *nix platforms. It has very -attractive skinnable user interface. - -And what more? - -XMPS is built on top of the SMPEG library from Loki entertainment. It has full -playlist support, can use OpenGL for the display if available, so that you can -play full-screen MPEGs without having to change screen resolution. +(hopefully) play MPEG-1/MPEG-2/FLI/FLC/AVI files with sound under the *nix +platforms. It has very attractive skinnable user interface. WWW: http://xmps.sourceforge.net/ diff --git a/graphics/xmps/pkg-plist b/graphics/xmps/pkg-plist index 323a51d7d353..a4cfe69cc1f5 100644 --- a/graphics/xmps/pkg-plist +++ b/graphics/xmps/pkg-plist @@ -1,15 +1,26 @@ 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 +include/libxmps/libxmps.h +include/libxmps/libxmps_config.h lib/libxmps.so -lib/xmps/Codecs/libflx.so -lib/xmps/Codecs/libsmpeg.so -lib/xmps/Renderers/libSDL.so -lib/xmps/Renderers/libX11.so +lib/libxmps.so.0 +lib/libxmpsutils.so +lib/libxmpsutils.so.0 +lib/xmps/addons/video/libvob.so +lib/xmps/codecs/audio/libac3.so +lib/xmps/codecs/audio/libmpeg.so +lib/xmps/codecs/audio/libwav.so +lib/xmps/codecs/video/libflx.so +lib/xmps/codecs/video/libmpeg3.so +lib/xmps/gui/libgnome.so +lib/xmps/gui/libskinned.so +lib/xmps/media/libfile.so +lib/xmps/media/libhttp.so +lib/xmps/renderers/audio/libsdl.so +lib/xmps/renderers/video/libsdl.so +lib/xmps/system/libavi.so +lib/xmps/system/libdummy.so +lib/xmps/system/libmpeg3.so share/aclocal/xmps.m4 share/gnome/apps/Multimedia/XMPS.desktop share/gnome/xmps/fast_forward.xpm @@ -43,7 +54,16 @@ share/locale/sv/LC_MESSAGES/xmps.mo @dirrm share/gnome/xmps/skins/DarkDepth @dirrm share/gnome/xmps/skins @dirrm share/gnome/xmps -@dirrm lib/xmps/Renderers -@dirrm lib/xmps/Codecs +@dirrm lib/xmps/system +@dirrm lib/xmps/renderers/video +@dirrm lib/xmps/renderers/audio +@dirrm lib/xmps/renderers +@dirrm lib/xmps/media +@dirrm lib/xmps/gui +@dirrm lib/xmps/codecs/video +@dirrm lib/xmps/codecs/audio +@dirrm lib/xmps/codecs +@dirrm lib/xmps/addons/video +@dirrm lib/xmps/addons @dirrm lib/xmps -@dirrm include/xmps +@dirrm include/libxmps diff --git a/multimedia/xmps/Makefile b/multimedia/xmps/Makefile index c7de3378445a..53898ffda91c 100644 --- a/multimedia/xmps/Makefile +++ b/multimedia/xmps/Makefile @@ -6,19 +6,17 @@ # PORTNAME= xmps -PORTVERSION= 0.1.3 +PORTVERSION= 0.2.0 CATEGORIES= graphics gnome MASTER_SITES= http://xmps.sourceforge.net/sources/ MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= smpeg.1:${PORTSDIR}/graphics/smpeg -BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm - SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config USE_X_PREFIX= yes USE_GNOME= yes +INSTALLS_SHLIB= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ SDL_CONFIG="${SDL_CONFIG}" \ @@ -29,7 +27,8 @@ pre-patch: @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ s|\$$\(datadir\)/aclocal|\$$\(prefix\)/share/aclocal|g ; \ - s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g ; \ + s|-lpthread|-pthread|g' post-configure: @${PERL} -pi -e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \ diff --git a/multimedia/xmps/distinfo b/multimedia/xmps/distinfo index bc9d8b9e5b3b..17427f68a542 100644 --- a/multimedia/xmps/distinfo +++ b/multimedia/xmps/distinfo @@ -1 +1 @@ -MD5 (xmps-0.1.3.tar.gz) = f56559b59e83e3e5eee518b63d95416c +MD5 (xmps-0.2.0.tar.gz) = 87937db0d26e599003f0e8db4284e16b diff --git a/multimedia/xmps/files/patch-aa b/multimedia/xmps/files/patch-aa index c859c119338c..baaab7875043 100644 --- a/multimedia/xmps/files/patch-aa +++ b/multimedia/xmps/files/patch-aa @@ -1,62 +1,30 @@ ---- 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 - -- 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 @@ + +$FreeBSD$ + +--- configure.orig Sun Feb 4 21:49:31 2001 ++++ configure Sun Feb 4 21:52:15 2001 +@@ -3694,16 +3694,16 @@ { 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:3700: 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:3980: checking for sys/dir.h" >&5 ++echo "configure:3700: checking for dirent.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3983,7 +3983,7 @@ + else cat > conftest.$ac_ext <<EOF - #line 3985 "configure" + #line 3705 "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:3990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -4005,7 +4005,7 @@ + { (eval echo configure:3710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +@@ -3725,7 +3725,7 @@ : else echo "$ac_t""no" 1>&6 @@ -65,12 +33,12 @@ fi -@@ -5915,7 +5915,7 @@ +@@ -5636,7 +5636,7 @@ < $srcdir/po/POTFILES.in > po/POTFILES --CFLAGS="$CFLAGS `gtk-config --cflags`" -+CFLAGS="$CFLAGS `$GTK_CONFIG --cflags`" +-CFLAGS="$CFLAGS `gtk-config --cflags` -Wall -Werror" ++CFLAGS="$CFLAGS `$GTK_CONFIG --cflags` -Wall -Werror" - CODEC_PLUGINS_DIR=Codecs + VIDEO_ADDON_PLUGIN_DIR=addons/video diff --git a/multimedia/xmps/files/patch-ab b/multimedia/xmps/files/patch-ab index 270474988096..aca750600a37 100644 --- a/multimedia/xmps/files/patch-ab +++ b/multimedia/xmps/files/patch-ab @@ -1,11 +1,11 @@ ---- Output/SDL/sdl_renderer.h.orig Thu Jun 15 11:33:24 2000 -+++ Output/SDL/sdl_renderer.h Thu Jun 15 11:33:35 2000 -@@ -25,7 +25,7 @@ - #ifndef _SDL_RENDERER_H - #define _SDL_RENDERER_H +--- renderers/video/sdl/sdl_renderer.h 2001/02/04 19:53:13 1.1 ++++ renderers/video/sdl/sdl_renderer.h 2001/02/04 19:53:23 +@@ -40,7 +40,7 @@ + * + */ -#include <SDL/SDL.h> +#include <SDL.h> - #include <src/types.h> - #include <src/xmps_utils.h> + #include "libxmps/libxmps.h" + diff --git a/multimedia/xmps/files/patch-ac b/multimedia/xmps/files/patch-ac deleted file mode 100644 index fc6db3042567..000000000000 --- a/multimedia/xmps/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- Output/X11/stretch.h.orig Thu Jun 15 11:36:00 2000 -+++ Output/X11/stretch.h Thu Jun 15 11:36:11 2000 -@@ -27,7 +27,7 @@ - #ifndef _STRETCH_H - #define _STRETCH_H - --#include <SDL/SDL.h> -+#include <SDL.h> - - /* setup scaling routine. must be called before AS_stretchBlit - Returns 0 on success, nonzero if bit depth is invalid (not 16 nor 32), diff --git a/multimedia/xmps/files/patch-ad b/multimedia/xmps/files/patch-ad deleted file mode 100644 index 1788b62013d0..000000000000 --- a/multimedia/xmps/files/patch-ad +++ /dev/null @@ -1,27 +0,0 @@ ---- 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 -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 stretch.h stretch.c stretchblt.S - - #mmx.S - --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 = -@@ -353,6 +353,8 @@ - distclean-generic clean-generic maintainer-clean-generic clean \ - mostlyclean distclean maintainer-clean - -+stretchblt.o: -+ nasm -f elf stretchblt.asm - - stretchblt.lo: - nasm -f elf -o stretchblt.o stretchblt.S diff --git a/multimedia/xmps/files/patch-ae b/multimedia/xmps/files/patch-ae deleted file mode 100644 index 1f2e2ac7b29b..000000000000 --- a/multimedia/xmps/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- src/types.h 2000/08/30 13:38:31 1.1 -+++ src/types.h 2000/08/30 13:38:42 -@@ -26,7 +26,7 @@ - */ - - #include <gtk/gtk.h> --#include <SDL/SDL.h> -+#include <SDL.h> - #include <pthread.h> - - /* MACROS */ diff --git a/multimedia/xmps/files/patch-af b/multimedia/xmps/files/patch-af deleted file mode 100644 index b86e6fff559f..000000000000 --- a/multimedia/xmps/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 = diff --git a/multimedia/xmps/files/patch-codecs::audio::ac3::ac3_codec.c b/multimedia/xmps/files/patch-codecs::audio::ac3::ac3_codec.c new file mode 100644 index 000000000000..a7c921fe63b2 --- /dev/null +++ b/multimedia/xmps/files/patch-codecs::audio::ac3::ac3_codec.c @@ -0,0 +1,50 @@ + +$FreeBSD$ + +--- codecs/audio/ac3/ac3_codec.c.orig Mon Nov 20 21:41:18 2000 ++++ codecs/audio/ac3/ac3_codec.c Sun Feb 4 23:18:46 2001 +@@ -60,7 +60,7 @@ + + } ac3_t; + +-int error; ++int ac3_error; + + /* + * get_audio_codec_info : MANDATORY +@@ -96,7 +96,7 @@ + ((ac3_t *) audio_decoder->data)->smixlev_lut[2] = 0.0; + ((ac3_t *) audio_decoder->data)->smixlev_lut[3] = 0.500; + +- error = 0; ++ ac3_error = 0; + + return audio_decoder; + } +@@ -208,7 +208,7 @@ + + exponent_unpack(&data->bsi, &data->audblk); + +- if(error) ++ if(ac3_error) + goto error; + + // Figure out how many bits per mantissa +@@ -220,7 +220,7 @@ + + coeff_unpack (&data->bsi, &data->audblk, data->samples); + +- if(error) ++ if(ac3_error) + goto error; + + if(data->bsi.acmod == 0x2) +@@ -242,7 +242,7 @@ + memset(data->s16_samples, 0, 256*2*2*6); + ring_write((char *) data->s16_samples, 256*2*2*6); + +- error = 0; ++ ac3_error = 0; + + } + diff --git a/multimedia/xmps/files/patch-codecs::audio::ac3::coeff.c b/multimedia/xmps/files/patch-codecs::audio::ac3::coeff.c new file mode 100644 index 000000000000..9f2576ac8fc7 --- /dev/null +++ b/multimedia/xmps/files/patch-codecs::audio::ac3::coeff.c @@ -0,0 +1,23 @@ + +$FreeBSD$ + +--- codecs/audio/ac3/coeff.c 2001/02/04 21:17:23 1.1 ++++ codecs/audio/ac3/coeff.c 2001/02/04 21:17:55 +@@ -254,7 +254,7 @@ + 11, 12, 14, 16 + }; + +-extern int error; ++extern int ac3_error; + + static void coeff_reset(void); + static float coeff_get_float(uint16_t bap, uint16_t dithflag, uint16_t exp); +@@ -370,7 +370,7 @@ + + error: + XMPS_DEBUG("** Invalid mantissa - skipping frame **"); +- error = 1; ++ ac3_error = 1; + + return 0.0; + } diff --git a/multimedia/xmps/files/patch-codecs::audio::ac3::exponent.c b/multimedia/xmps/files/patch-codecs::audio::ac3::exponent.c new file mode 100644 index 000000000000..e629e1847969 --- /dev/null +++ b/multimedia/xmps/files/patch-codecs::audio::ac3::exponent.c @@ -0,0 +1,22 @@ + +$FreeBSD$ + +--- codecs/audio/ac3/exponent.c 2001/02/04 21:17:23 1.1 ++++ codecs/audio/ac3/exponent.c 2001/02/04 21:18:06 +@@ -30,7 +30,7 @@ + + #include "exponent.h" + +-extern int error; ++extern int ac3_error; + + static inline void exp_unpack_ch(uint16_t type,uint16_t expstr,uint16_t ngrps,uint16_t initial_exp, uint16_t exps[], uint16_t *dest); + +@@ -126,6 +126,6 @@ + return; + error: + fprintf (stderr,"** Invalid exponent - skipping frame **\n"); +- error = 1; ++ ac3_error = 1; + } + diff --git a/multimedia/xmps/files/patch-codecs::video::flx::Makefile.in b/multimedia/xmps/files/patch-codecs::video::flx::Makefile.in new file mode 100644 index 000000000000..5746825836c5 --- /dev/null +++ b/multimedia/xmps/files/patch-codecs::video::flx::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- codecs/video/flx/Makefile.in.orig Sat Jan 20 01:53:42 2001 ++++ codecs/video/flx/Makefile.in Sun Feb 4 22:55:34 2001 +@@ -125,7 +125,7 @@ + libflx_la_SOURCES = flx_codec.h flx_codec.c + + +-INCLUDES = @CFLAGS@ -DVERSION=\"@VERSION@\" -DPACKAGE=\"@PACKAGE@\" -I$(includedir) -I$(top_srcdir)/src -I$(top_srcdir)/libxmps -I$(top_srcdir)/intl -I../../src -I../../libxmps -Wall ++INCLUDES = @CFLAGS@ @SDL_CFLAGS@ -DVERSION=\"@VERSION@\" -DPACKAGE=\"@PACKAGE@\" -I$(includedir) -I$(top_srcdir)/src -I$(top_srcdir)/libxmps -I$(top_srcdir)/intl -I../../src -I../../libxmps -Wall + + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h diff --git a/multimedia/xmps/files/patch-codecs::video::flx::flx_codec.h b/multimedia/xmps/files/patch-codecs::video::flx::flx_codec.h new file mode 100644 index 000000000000..bedd02f21154 --- /dev/null +++ b/multimedia/xmps/files/patch-codecs::video::flx::flx_codec.h @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- codecs/video/flx/flx_codec.h.orig Wed Nov 1 20:46:14 2000 ++++ codecs/video/flx/flx_codec.h Sun Feb 4 22:55:34 2001 +@@ -52,7 +52,7 @@ + #include <stdlib.h> + #include <string.h> + #include <unistd.h> +-#include <SDL/SDL.h> ++#include <SDL.h> + + typedef struct { + diff --git a/multimedia/xmps/files/patch-gui::skinned::xmps_skin_browser.h b/multimedia/xmps/files/patch-gui::skinned::xmps_skin_browser.h new file mode 100644 index 000000000000..c1a1fdae736e --- /dev/null +++ b/multimedia/xmps/files/patch-gui::skinned::xmps_skin_browser.h @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- gui/skinned/xmps_skin_browser.h.orig Thu Nov 23 16:06:40 2000 ++++ gui/skinned/xmps_skin_browser.h Sun Feb 4 22:55:34 2001 +@@ -36,7 +36,7 @@ + /* INCLUDES */ + + #include <gtk/gtk.h> +-#include <sys/dir.h> ++#include <dirent.h> + #include <sys/stat.h> + #include "libxmps/libxmps.h" + #include "libxmpsutils/libxmpsutils.h" diff --git a/multimedia/xmps/files/patch-libxmps::Makefile.in b/multimedia/xmps/files/patch-libxmps::Makefile.in new file mode 100644 index 000000000000..c88117b1482b --- /dev/null +++ b/multimedia/xmps/files/patch-libxmps::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- libxmps/Makefile.in.orig Sun Feb 4 23:01:50 2001 ++++ libxmps/Makefile.in Sun Feb 4 23:02:33 2001 +@@ -120,7 +120,7 @@ + + libxmpsincludedir = $(includedir)/libxmps + +-libxmps_la_LDFLAGS = -module -avoid-version ++libxmps_la_LDFLAGS = -module + libxmps_la_LIBADD = -pthread + + libxmps_la_SOURCES = libxmps_config.h libxmps_config.c libxmps_graph.c libxmps_events.c libxmps_video_conversion.c libxmps_xml.c libxmps.h libxmps.c diff --git a/multimedia/xmps/files/patch-libxmpsutils::Makefile.in b/multimedia/xmps/files/patch-libxmpsutils::Makefile.in new file mode 100644 index 000000000000..4810f38c24df --- /dev/null +++ b/multimedia/xmps/files/patch-libxmpsutils::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- libxmpsutils/Makefile.in 2001/02/04 21:00:58 1.1 ++++ libxmpsutils/Makefile.in 2001/02/04 21:01:11 +@@ -118,7 +118,7 @@ + + lib_LTLIBRARIES = libxmpsutils.la + +-libxmpsutils_la_LDFLAGS = -module -avoid-version ++libxmpsutils_la_LDFLAGS = -module + libxmpsutils_la_LIBADD = @GTK_LIBS@ + + libxmpsutils_la_SOURCES = xmps_support.c xmps_support.h xmps_i18n.h xmps_message.h xmps_message.c xmps_item.h xmps_item.c xmps_menu.h xmps_menu.c xmps_playlist.h xmps_playlist.c xmps_file_info.h xmps_file_info.c xmps_gtk_config.h xmps_gtk_config.c xmps_about.c xmps_utils.h xmps_utils.c libxmpsutils.h diff --git a/multimedia/xmps/files/patch-renderers::audio::sdl::sdl_audio_renderer.h b/multimedia/xmps/files/patch-renderers::audio::sdl::sdl_audio_renderer.h new file mode 100644 index 000000000000..44e9c9aaac45 --- /dev/null +++ b/multimedia/xmps/files/patch-renderers::audio::sdl::sdl_audio_renderer.h @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- renderers/audio/sdl/sdl_audio_renderer.h.orig Fri Nov 3 21:41:37 2000 ++++ renderers/audio/sdl/sdl_audio_renderer.h Sun Feb 4 22:55:34 2001 +@@ -34,7 +34,7 @@ + + #include "libxmps/libxmps.h" + +-#include <SDL/SDL.h> ++#include <SDL.h> + #include <string.h> + + #ifdef HAVE_CONFIG_H diff --git a/multimedia/xmps/files/patch-src::Makefile.in b/multimedia/xmps/files/patch-src::Makefile.in new file mode 100644 index 000000000000..53d416227753 --- /dev/null +++ b/multimedia/xmps/files/patch-src::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- src/Makefile.in.orig Sat Jan 20 01:53:55 2001 ++++ src/Makefile.in Sun Feb 4 22:55:34 2001 +@@ -126,7 +126,7 @@ + xmps_SOURCES = main.c + + +-xmps_LDADD = -L@LIBXMPS_DIR@ -lxmps -L@LIBXMPSUTILS_DIR@ -lxmpsutils ++xmps_LDADD = -L@LIBXMPS_DIR@ -lxmps -L@LIBXMPSUTILS_DIR@ -lxmpsutils -pthread + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = diff --git a/multimedia/xmps/files/patch-system::mpeg3::mpeg3io.c b/multimedia/xmps/files/patch-system::mpeg3::mpeg3io.c new file mode 100644 index 000000000000..ebc186470bf0 --- /dev/null +++ b/multimedia/xmps/files/patch-system::mpeg3::mpeg3io.c @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- system/mpeg3/mpeg3io.c.orig Fri Nov 3 21:41:37 2000 ++++ system/mpeg3/mpeg3io.c Sun Feb 4 22:55:34 2001 +@@ -20,7 +20,6 @@ + #include "mpeg3protos.h" + + #include <stdio.h> +-#include <mntent.h> + #include <sys/stat.h> + #include <stdlib.h> + #include <string.h> diff --git a/multimedia/xmps/pkg-comment b/multimedia/xmps/pkg-comment index f4d8e4a417eb..96525f843919 100644 --- a/multimedia/xmps/pkg-comment +++ b/multimedia/xmps/pkg-comment @@ -1 +1 @@ -X MPEG Player System - a MPEG-1 video player with a very nice GUI +X MPEG Player System - a media player with a very nice GUI diff --git a/multimedia/xmps/pkg-descr b/multimedia/xmps/pkg-descr index f3122b9dae59..8cb286dc4362 100644 --- a/multimedia/xmps/pkg-descr +++ b/multimedia/xmps/pkg-descr @@ -1,11 +1,5 @@ XMPS stands for X MPEG Player System. It's a simple Gtk program that will -(hopefully) play MPEG-1 files with sound under the *nix platforms. It has very -attractive skinnable user interface. - -And what more? - -XMPS is built on top of the SMPEG library from Loki entertainment. It has full -playlist support, can use OpenGL for the display if available, so that you can -play full-screen MPEGs without having to change screen resolution. +(hopefully) play MPEG-1/MPEG-2/FLI/FLC/AVI files with sound under the *nix +platforms. It has very attractive skinnable user interface. WWW: http://xmps.sourceforge.net/ diff --git a/multimedia/xmps/pkg-plist b/multimedia/xmps/pkg-plist index 323a51d7d353..a4cfe69cc1f5 100644 --- a/multimedia/xmps/pkg-plist +++ b/multimedia/xmps/pkg-plist @@ -1,15 +1,26 @@ 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 +include/libxmps/libxmps.h +include/libxmps/libxmps_config.h lib/libxmps.so -lib/xmps/Codecs/libflx.so -lib/xmps/Codecs/libsmpeg.so -lib/xmps/Renderers/libSDL.so -lib/xmps/Renderers/libX11.so +lib/libxmps.so.0 +lib/libxmpsutils.so +lib/libxmpsutils.so.0 +lib/xmps/addons/video/libvob.so +lib/xmps/codecs/audio/libac3.so +lib/xmps/codecs/audio/libmpeg.so +lib/xmps/codecs/audio/libwav.so +lib/xmps/codecs/video/libflx.so +lib/xmps/codecs/video/libmpeg3.so +lib/xmps/gui/libgnome.so +lib/xmps/gui/libskinned.so +lib/xmps/media/libfile.so +lib/xmps/media/libhttp.so +lib/xmps/renderers/audio/libsdl.so +lib/xmps/renderers/video/libsdl.so +lib/xmps/system/libavi.so +lib/xmps/system/libdummy.so +lib/xmps/system/libmpeg3.so share/aclocal/xmps.m4 share/gnome/apps/Multimedia/XMPS.desktop share/gnome/xmps/fast_forward.xpm @@ -43,7 +54,16 @@ share/locale/sv/LC_MESSAGES/xmps.mo @dirrm share/gnome/xmps/skins/DarkDepth @dirrm share/gnome/xmps/skins @dirrm share/gnome/xmps -@dirrm lib/xmps/Renderers -@dirrm lib/xmps/Codecs +@dirrm lib/xmps/system +@dirrm lib/xmps/renderers/video +@dirrm lib/xmps/renderers/audio +@dirrm lib/xmps/renderers +@dirrm lib/xmps/media +@dirrm lib/xmps/gui +@dirrm lib/xmps/codecs/video +@dirrm lib/xmps/codecs/audio +@dirrm lib/xmps/codecs +@dirrm lib/xmps/addons/video +@dirrm lib/xmps/addons @dirrm lib/xmps -@dirrm include/xmps +@dirrm include/libxmps |