diff options
Diffstat (limited to 'multimedia/xmps/files')
14 files changed, 281 insertions, 0 deletions
diff --git a/multimedia/xmps/files/patch-aa b/multimedia/xmps/files/patch-aa new file mode 100644 index 000000000..d1375f07e --- /dev/null +++ b/multimedia/xmps/files/patch-aa @@ -0,0 +1,44 @@ + +$FreeBSD: ports/multimedia/xmps/files/patch-aa,v 1.4 2001/02/04 22:01:32 sobomax Exp $ + +--- 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: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 + else + cat > conftest.$ac_ext <<EOF + #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:3710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +@@ -3725,7 +3725,7 @@ + : + else + echo "$ac_t""no" 1>&6 +-{ echo "configure: error: **** Cannot find dir.h ****" 1>&2; exit 1; } ++{ echo "configure: error: **** Cannot find dirent.h ****" 1>&2; exit 1; } + fi + + +@@ -5636,7 +5636,7 @@ + < $srcdir/po/POTFILES.in > po/POTFILES + + +-CFLAGS="$CFLAGS `gtk-config --cflags` -Wall -Werror" ++CFLAGS="$CFLAGS `$GTK_CONFIG --cflags` -Wall -Werror" + + + VIDEO_ADDON_PLUGIN_DIR=addons/video diff --git a/multimedia/xmps/files/patch-ab b/multimedia/xmps/files/patch-ab new file mode 100644 index 000000000..aca750600 --- /dev/null +++ b/multimedia/xmps/files/patch-ab @@ -0,0 +1,11 @@ +--- 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 "libxmps/libxmps.h" + diff --git a/multimedia/xmps/files/patch-codecs-video-mpeg3-motion_comp.c b/multimedia/xmps/files/patch-codecs-video-mpeg3-motion_comp.c new file mode 100644 index 000000000..07e2c5ae7 --- /dev/null +++ b/multimedia/xmps/files/patch-codecs-video-mpeg3-motion_comp.c @@ -0,0 +1,20 @@ +--- codecs/video/mpeg3/motion_comp.c.orig Tue Oct 28 08:53:27 2003 ++++ codecs/video/mpeg3/motion_comp.c Tue Oct 28 08:55:16 2003 +@@ -66,7 +66,7 @@ + // mc function template + + #define MC_FUNC(op,xy) \ +-static void motion_comp_##op####xy##_16x16_c (uint8_t * dest, \ ++static void motion_comp_##op##xy##_16x16_c (uint8_t * dest, \ + uint8_t * ref, \ + int stride, \ + int height) \ +@@ -92,7 +92,7 @@ + dest += stride; \ + } while (--height); \ + } \ +-static void motion_comp_##op####xy##_8x8_c (uint8_t * dest, \ ++static void motion_comp_##op##xy##_8x8_c (uint8_t * dest, \ + uint8_t * ref, \ + int stride, \ + int height) \ 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 000000000..b2d828dae --- /dev/null +++ b/multimedia/xmps/files/patch-codecs::audio::ac3::ac3_codec.c @@ -0,0 +1,50 @@ + +$FreeBSD: ports/multimedia/xmps/files/patch-codecs::audio::ac3::ac3_codec.c,v 1.1 2001/02/04 22:01:32 sobomax Exp $ + +--- 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 000000000..2c769f57f --- /dev/null +++ b/multimedia/xmps/files/patch-codecs::audio::ac3::coeff.c @@ -0,0 +1,23 @@ + +$FreeBSD: ports/multimedia/xmps/files/patch-codecs::audio::ac3::coeff.c,v 1.1 2001/02/04 22:01:32 sobomax Exp $ + +--- 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 000000000..0c39f00b3 --- /dev/null +++ b/multimedia/xmps/files/patch-codecs::audio::ac3::exponent.c @@ -0,0 +1,22 @@ + +$FreeBSD: ports/multimedia/xmps/files/patch-codecs::audio::ac3::exponent.c,v 1.1 2001/02/04 22:01:32 sobomax Exp $ + +--- 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 000000000..2a01bfc4b --- /dev/null +++ b/multimedia/xmps/files/patch-codecs::video::flx::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD: ports/multimedia/xmps/files/patch-codecs::video::flx::Makefile.in,v 1.1 2001/02/04 22:01:32 sobomax Exp $ + +--- 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 000000000..ec33d2ab6 --- /dev/null +++ b/multimedia/xmps/files/patch-codecs::video::flx::flx_codec.h @@ -0,0 +1,14 @@ + +$FreeBSD: ports/multimedia/xmps/files/patch-codecs::video::flx::flx_codec.h,v 1.1 2001/02/04 22:01:32 sobomax Exp $ + +--- 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 000000000..a14c179c8 --- /dev/null +++ b/multimedia/xmps/files/patch-gui::skinned::xmps_skin_browser.h @@ -0,0 +1,14 @@ + +$FreeBSD: ports/multimedia/xmps/files/patch-gui::skinned::xmps_skin_browser.h,v 1.1 2001/02/04 22:01:32 sobomax Exp $ + +--- 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 000000000..1f82fb687 --- /dev/null +++ b/multimedia/xmps/files/patch-libxmps::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD: ports/multimedia/xmps/files/patch-libxmps::Makefile.in,v 1.2 2001/04/02 09:12:43 sobomax Exp $ + +--- 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 = -lpthread + + 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 000000000..ab4bb483c --- /dev/null +++ b/multimedia/xmps/files/patch-libxmpsutils::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD: ports/multimedia/xmps/files/patch-libxmpsutils::Makefile.in,v 1.1 2001/02/04 22:01:32 sobomax Exp $ + +--- 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 000000000..7c0b87c2f --- /dev/null +++ b/multimedia/xmps/files/patch-renderers::audio::sdl::sdl_audio_renderer.h @@ -0,0 +1,14 @@ + +$FreeBSD: ports/multimedia/xmps/files/patch-renderers::audio::sdl::sdl_audio_renderer.h,v 1.1 2001/02/04 22:01:32 sobomax Exp $ + +--- 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 000000000..d385881d3 --- /dev/null +++ b/multimedia/xmps/files/patch-src::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD: ports/multimedia/xmps/files/patch-src::Makefile.in,v 1.2 2001/04/02 09:12:43 sobomax Exp $ + +--- 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 -lpthread + 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 000000000..be5bc3931 --- /dev/null +++ b/multimedia/xmps/files/patch-system::mpeg3::mpeg3io.c @@ -0,0 +1,13 @@ + +$FreeBSD: ports/multimedia/xmps/files/patch-system::mpeg3::mpeg3io.c,v 1.1 2001/02/04 22:01:32 sobomax Exp $ + +--- 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> |