diff options
author | grant <grant> | 2004-06-26 09:16:10 +0000 |
---|---|---|
committer | grant <grant> | 2004-06-26 09:16:10 +0000 |
commit | 1731596fde3502ecd85beb7c50f66d79ccec3b57 (patch) | |
tree | 50fbb96794bc53730f962430e0fc562a5c3bd0ec /multimedia/smpeg/patches | |
parent | 2e1aac70ebc9287085f92e36b0442fcc5ec29fec (diff) | |
download | pkgsrc-1731596fde3502ecd85beb7c50f66d79ccec3b57.tar.gz |
move smpeg to multimedia/
Diffstat (limited to 'multimedia/smpeg/patches')
-rw-r--r-- | multimedia/smpeg/patches/patch-aa | 26 | ||||
-rw-r--r-- | multimedia/smpeg/patches/patch-ab | 23 | ||||
-rw-r--r-- | multimedia/smpeg/patches/patch-ac | 13 |
3 files changed, 62 insertions, 0 deletions
diff --git a/multimedia/smpeg/patches/patch-aa b/multimedia/smpeg/patches/patch-aa new file mode 100644 index 00000000000..697bd22594b --- /dev/null +++ b/multimedia/smpeg/patches/patch-aa @@ -0,0 +1,26 @@ +$NetBSD: patch-aa,v 1.1 2004/06/26 09:16:10 grant Exp $ + +--- plaympeg.c.orig Tue Feb 4 15:59:22 2003 ++++ plaympeg.c Tue Feb 4 15:59:48 2003 +@@ -492,6 +492,7 @@ + int fd; + char buf[32]; + int status; ++ int (*audio_init)(); + + /* Get the command line options */ + use_audio = 1; +@@ -600,7 +601,12 @@ + } + + if ( use_audio ) { +- if ((SDL_Init(SDL_INIT_AUDIO) < 0) || !SDL_AudioDriverName(buf, 1)) { ++ if ( use_video ) ++ audio_init = SDL_InitSubSystem; ++ else ++ audio_init = SDL_Init; ++ ++ if ((audio_init(SDL_INIT_AUDIO) < 0) || !SDL_AudioDriverName(buf, 1)) { + fprintf(stderr, "Warning: Couldn't init SDL audio: %s\n", + SDL_GetError()); + fprintf(stderr, "Will ignore audio stream\n"); diff --git a/multimedia/smpeg/patches/patch-ab b/multimedia/smpeg/patches/patch-ab new file mode 100644 index 00000000000..62e187b2201 --- /dev/null +++ b/multimedia/smpeg/patches/patch-ab @@ -0,0 +1,23 @@ +$NetBSD: patch-ab,v 1.1 2004/06/26 09:16:10 grant Exp $ + +--- Makefile.in.orig 2001-06-18 22:59:14.000000000 +0200 ++++ Makefile.in +@@ -310,15 +310,15 @@ uninstall-binPROGRAMS: + + plaympeg: $(plaympeg_OBJECTS) $(plaympeg_DEPENDENCIES) + @rm -f plaympeg +- $(LINK) $(plaympeg_LDFLAGS) $(plaympeg_OBJECTS) $(plaympeg_LDADD) $(LIBS) ++ $(CXXLINK) $(plaympeg_LDFLAGS) $(plaympeg_OBJECTS) $(plaympeg_LDADD) $(LIBS) + + gtv: $(gtv_OBJECTS) $(gtv_DEPENDENCIES) + @rm -f gtv +- $(LINK) $(gtv_LDFLAGS) $(gtv_OBJECTS) $(gtv_LDADD) $(LIBS) ++ $(CXXLINK) $(gtv_LDFLAGS) $(gtv_OBJECTS) $(gtv_LDADD) $(LIBS) + + glmovie: $(glmovie_OBJECTS) $(glmovie_DEPENDENCIES) + @rm -f glmovie +- $(LINK) $(glmovie_LDFLAGS) $(glmovie_OBJECTS) $(glmovie_LDADD) $(LIBS) ++ $(CXXLINK) $(glmovie_LDFLAGS) $(glmovie_OBJECTS) $(glmovie_LDADD) $(LIBS) + + install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) diff --git a/multimedia/smpeg/patches/patch-ac b/multimedia/smpeg/patches/patch-ac new file mode 100644 index 00000000000..7af7271bd57 --- /dev/null +++ b/multimedia/smpeg/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2004/06/26 09:16:10 grant Exp $ + +--- video/video.h.orig 2004-03-01 02:14:39.000000000 +0100 ++++ video/video.h 2004-03-01 02:16:02.000000000 +0100 +@@ -413,7 +413,7 @@ + #define __SCO__ 1 + #endif + +-#if defined(__i386__) || defined(__VAX__) || defined(__MIPSEL__) || defined(__alpha__) || defined(__SCO__) ++#if defined(__x86_64__) || defined(__i386__) || defined(__VAX__) || defined(__MIPSEL__) || defined(__alpha__) || defined(__SCO__) + #undef BIG_ENDIAN_ARCHITECTURE + #define LITTLE_ENDIAN_ARCHITECTURE 1 + #endif |