Update to swfdec-0.8.4

including sndio support

From Jacob Meuser (jakemsr@)
This commit is contained in:
phessler 2009-06-07 11:52:16 +00:00
parent 7fb5c338c8
commit 3bd3a5f99d
4 changed files with 50 additions and 126 deletions

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-player_Makefile_in,v 1.1 2008/08/20 15:55:15 jasper Exp $
--- player/Makefile.in.orig Thu Aug 14 12:16:48 2008
+++ player/Makefile.in Thu Aug 14 12:17:01 2008
@@ -126,7 +126,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lossaudio
LIBOBJS = @LIBOBJS@
LIBOIL_CFLAGS = @LIBOIL_CFLAGS@
LIBOIL_LIBS = @LIBOIL_LIBS@

View File

@ -1,48 +0,0 @@
$OpenBSD: patch-swfdec-gtk_swfdec_playback_oss_c,v 1.1 2008/08/20 15:55:15 jasper Exp $
--- swfdec-gtk/swfdec_playback_oss.c.orig Tue Jul 29 11:52:44 2008
+++ swfdec-gtk/swfdec_playback_oss.c Thu Aug 14 13:42:00 2008
@@ -23,7 +23,11 @@
#endif
#include <sys/ioctl.h>
+#if defined(__OpenBSD__)
+#include <soundcard.h>
+#else
#include <sys/soundcard.h>
+#endif /* __OpenBSD__ */
#include <fcntl.h>
#include <unistd.h>
#include <stdlib.h>
@@ -31,10 +35,10 @@
#include "swfdec_playback.h"
-/** @file Implements swfdec audio playback by opening /dev/dsp per stream
+/** @file Implements swfdec audio playback by opening /dev/audio per stream
* and playing out through that.
*
- * Allowing multiple access to /dev/dsp is not required by the OSS API spec,
+ * Allowing multiple access to /dev/audio is not required by the OSS API spec,
* but FreeBSD's sound system lets you, which is what this file was written
* for.
*/
@@ -115,11 +119,19 @@ swfdec_playback_stream_open (SwfdecPlayback *sound, Sw
guint rate;
int dsp_fd, ret, format, channels, fragsize;
+#if defined(__OpenBSD__)
+ dsp_fd = open("/dev/audio", O_WRONLY);
+ if (dsp_fd == -1) {
+ g_printerr ("Failed to open /dev/audio\n");
+ return;
+ }
+#else
dsp_fd = open("/dev/dsp", O_WRONLY);
if (dsp_fd == -1) {
g_printerr ("Failed to open /dev/dsp\n");
return;
}
+#endif
format = AFMT_S16_LE;
ret = ioctl(dsp_fd, SNDCTL_DSP_SETFMT, &format);

View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2008/08/20 15:55:15 jasper Exp $
@lib lib/libswfdec-0.6.so.${LIBswfdec-0.6_VERSION}
@lib lib/libswfdec-gtk-0.6.so.${LIBswfdec-gtk-0.6_VERSION}
@comment $OpenBSD: PFRAG.shared,v 1.5 2009/06/07 11:52:16 phessler Exp $
@lib lib/libswfdec-0.8.so.${LIBswfdec-0.8_VERSION}
@lib lib/libswfdec-gtk-0.8.so.${LIBswfdec-gtk-0.8_VERSION}

View File

@ -1,52 +1,54 @@
@comment $OpenBSD: PLIST,v 1.4 2008/08/20 15:55:15 jasper Exp $
@comment $OpenBSD: PLIST,v 1.5 2009/06/07 11:52:16 phessler Exp $
%%SHARED%%
include/swfdec-0.6/
include/swfdec-0.6/swfdec/
include/swfdec-0.6/swfdec-gtk/
include/swfdec-0.6/swfdec-gtk/swfdec-gtk.h
include/swfdec-0.6/swfdec-gtk/swfdec_gtk_keys.h
include/swfdec-0.6/swfdec-gtk/swfdec_gtk_loader.h
include/swfdec-0.6/swfdec-gtk/swfdec_gtk_player.h
include/swfdec-0.6/swfdec-gtk/swfdec_gtk_socket.h
include/swfdec-0.6/swfdec-gtk/swfdec_gtk_system.h
include/swfdec-0.6/swfdec-gtk/swfdec_gtk_widget.h
include/swfdec-0.6/swfdec/swfdec.h
include/swfdec-0.6/swfdec/swfdec_as_array.h
include/swfdec-0.6/swfdec/swfdec_as_context.h
include/swfdec-0.6/swfdec/swfdec_as_debugger.h
include/swfdec-0.6/swfdec/swfdec_as_frame.h
include/swfdec-0.6/swfdec/swfdec_as_function.h
include/swfdec-0.6/swfdec/swfdec_as_native_function.h
include/swfdec-0.6/swfdec/swfdec_as_object.h
include/swfdec-0.6/swfdec/swfdec_as_types.h
include/swfdec-0.6/swfdec/swfdec_audio.h
include/swfdec-0.6/swfdec/swfdec_buffer.h
include/swfdec-0.6/swfdec/swfdec_enums.h
include/swfdec-0.6/swfdec/swfdec_file_loader.h
include/swfdec-0.6/swfdec/swfdec_keys.h
include/swfdec-0.6/swfdec/swfdec_loader.h
include/swfdec-0.6/swfdec/swfdec_player.h
include/swfdec-0.6/swfdec/swfdec_player_scripting.h
include/swfdec-0.6/swfdec/swfdec_rectangle.h
include/swfdec-0.6/swfdec/swfdec_script.h
include/swfdec-0.6/swfdec/swfdec_socket.h
include/swfdec-0.6/swfdec/swfdec_stream.h
include/swfdec-0.6/swfdec/swfdec_system.h
include/swfdec-0.6/swfdec/swfdec_url.h
lib/libswfdec-0.6.a
lib/libswfdec-0.6.la
lib/libswfdec-gtk-0.6.a
lib/libswfdec-gtk-0.6.la
include/swfdec-0.8/
include/swfdec-0.8/swfdec/
include/swfdec-0.8/swfdec-gtk/
include/swfdec-0.8/swfdec-gtk/swfdec-gtk.h
include/swfdec-0.8/swfdec-gtk/swfdec_gtk_keys.h
include/swfdec-0.8/swfdec-gtk/swfdec_gtk_loader.h
include/swfdec-0.8/swfdec-gtk/swfdec_gtk_player.h
include/swfdec-0.8/swfdec-gtk/swfdec_gtk_socket.h
include/swfdec-0.8/swfdec-gtk/swfdec_gtk_system.h
include/swfdec-0.8/swfdec-gtk/swfdec_gtk_widget.h
include/swfdec-0.8/swfdec/swfdec.h
include/swfdec-0.8/swfdec/swfdec_as_array.h
include/swfdec-0.8/swfdec/swfdec_as_context.h
include/swfdec-0.8/swfdec/swfdec_as_debugger.h
include/swfdec-0.8/swfdec/swfdec_as_frame.h
include/swfdec-0.8/swfdec/swfdec_as_function.h
include/swfdec-0.8/swfdec/swfdec_as_native_function.h
include/swfdec-0.8/swfdec/swfdec_as_object.h
include/swfdec-0.8/swfdec/swfdec_as_types.h
include/swfdec-0.8/swfdec/swfdec_audio.h
include/swfdec-0.8/swfdec/swfdec_buffer.h
include/swfdec-0.8/swfdec/swfdec_enums.h
include/swfdec-0.8/swfdec/swfdec_file_loader.h
include/swfdec-0.8/swfdec/swfdec_gc_object.h
include/swfdec-0.8/swfdec/swfdec_keys.h
include/swfdec-0.8/swfdec/swfdec_loader.h
include/swfdec-0.8/swfdec/swfdec_player.h
include/swfdec-0.8/swfdec/swfdec_player_scripting.h
include/swfdec-0.8/swfdec/swfdec_rectangle.h
include/swfdec-0.8/swfdec/swfdec_renderer.h
include/swfdec-0.8/swfdec/swfdec_script.h
include/swfdec-0.8/swfdec/swfdec_socket.h
include/swfdec-0.8/swfdec/swfdec_stream.h
include/swfdec-0.8/swfdec/swfdec_system.h
include/swfdec-0.8/swfdec/swfdec_url.h
include/swfdec-0.8/swfdec/swfdec_version.h
lib/libswfdec-0.8.a
lib/libswfdec-0.8.la
lib/libswfdec-gtk-0.8.a
lib/libswfdec-gtk-0.8.la
lib/pkgconfig/
lib/pkgconfig/swfdec-0.6.pc
lib/pkgconfig/swfdec-gtk-0.6.pc
lib/pkgconfig/swfdec-0.8.pc
lib/pkgconfig/swfdec-gtk-0.8.pc
share/gtk-doc/
share/gtk-doc/html/
share/gtk-doc/html/swfdec/
share/gtk-doc/html/swfdec/SwfdecAsArray.html
share/gtk-doc/html/swfdec/SwfdecAsContext.html
share/gtk-doc/html/swfdec/SwfdecAsDebugger.html
share/gtk-doc/html/swfdec/SwfdecAsFrame.html
share/gtk-doc/html/swfdec/SwfdecAsFunction.html
share/gtk-doc/html/swfdec/SwfdecAsObject.html
share/gtk-doc/html/swfdec/SwfdecAudio.html
@ -55,6 +57,7 @@ share/gtk-doc/html/swfdec/SwfdecGtkWidget.html
share/gtk-doc/html/swfdec/SwfdecLoader.html
share/gtk-doc/html/swfdec/SwfdecPlayer.html
share/gtk-doc/html/swfdec/SwfdecPlayerScripting.html
share/gtk-doc/html/swfdec/SwfdecRenderer.html
share/gtk-doc/html/swfdec/SwfdecSocket.html
share/gtk-doc/html/swfdec/SwfdecStream.html
share/gtk-doc/html/swfdec/SwfdecSystem.html
@ -65,38 +68,19 @@ share/gtk-doc/html/swfdec/ch04.html
share/gtk-doc/html/swfdec/home.png
share/gtk-doc/html/swfdec/index.html
share/gtk-doc/html/swfdec/index.sgml
share/gtk-doc/html/swfdec/ix01.html
share/gtk-doc/html/swfdec/left.png
share/gtk-doc/html/swfdec/right.png
share/gtk-doc/html/swfdec/style.css
share/gtk-doc/html/swfdec/swfdec-Enumerations-and-Types.html
share/gtk-doc/html/swfdec/swfdec-Gtk-extension-objects.html
share/gtk-doc/html/swfdec/swfdec-Internals.html
share/gtk-doc/html/swfdec/swfdec-SwfdecAsFrame.html
share/gtk-doc/html/swfdec/swfdec-SwfdecAsValue.html
share/gtk-doc/html/swfdec/swfdec-SwfdecBuffer.html
share/gtk-doc/html/swfdec/swfdec-SwfdecRectangle.html
share/gtk-doc/html/swfdec/swfdec-SwfdecURL.html
share/gtk-doc/html/swfdec/swfdec-Version-Information.html
share/gtk-doc/html/swfdec/swfdec.devhelp
share/gtk-doc/html/swfdec/swfdec.devhelp2
share/gtk-doc/html/swfdec/up.png
share/icons/
share/icons/hicolor/
share/icons/hicolor/16x16/
share/icons/hicolor/16x16/apps/
share/icons/hicolor/16x16/apps/swfdec.png
share/icons/hicolor/22x22/
share/icons/hicolor/22x22/apps/
share/icons/hicolor/22x22/apps/swfdec.png
share/icons/hicolor/24x24/
share/icons/hicolor/24x24/apps/
share/icons/hicolor/24x24/apps/swfdec.png
share/icons/hicolor/32x32/
share/icons/hicolor/32x32/apps/
share/icons/hicolor/32x32/apps/swfdec.png
share/icons/hicolor/48x48/
share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/swfdec.png
share/icons/hicolor/scalable/
share/icons/hicolor/scalable/apps/
share/icons/hicolor/scalable/apps/swfdec.svg
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@unexec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true