cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cope with recent audio/tremor update.

Browse Source 
from Brad
This commit is contained in:
ajacoutot 2012-04-28 09:03:45 +00:00
parent ed82376280
commit f3535a9bfe
11 changed files with 203 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
audio/xmms-tremor/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.14 2011/10/12 12:54:31 jasper Exp $
# $OpenBSD: Makefile,v 1.15 2012/04/28 09:04:50 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= Ogg Vorbis input plugin for XMMS using tremor
DISTNAME= xmms-tremor-1.0
REVISION= 5
REVISION= 6
EXTRACT_SUFX= .tar.bz2
CATEGORIES= audio
MASTER_SITES= http://mirror1.pdaxrom.org/source/src/
@ -14,18 +14,19 @@ PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
LIB_DEPENDS= audio/tremor
LIB_DEPENDS= audio/tremor>=20120410
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= audio/xmms
WANTLIB= X11 Xext Xi gdk glib gmodule gtk m \
xcb vorbisidec>=1
WANTLIB= X11 Xext Xi gdk glib gmodule gtk m ogg \
vorbisidec>=3 xcb
MODULES += devel/gettext
USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.57
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
LIBTOOL_FLAGS= --tag=disable-static

12
audio/xmms-tremor/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure_ac,v 1.1 2012/04/28 09:04:50 ajacoutot Exp $
--- configure.ac.orig Fri Apr 13 02:40:25 2012
+++ configure.ac Fri Apr 13 02:40:44 2012
@@ -18,7 +18,7 @@ AM_PROG_LIBTOOL
# Checks for headers
AC_CHECK_HEADERS(sys/time.h fcntl.h libgen.h stdio.h assert.h sys/socket.h)
AC_CHECK_HEADERS(netinet/in.h arpa/inet.h netdb.h)
-AC_CHECK_HEADERS(tremor/ogg.h tremor/ivorbiscodec.h tremor/ivorbisfile.h,,AC_MSG_ERROR([*** Tremor headers not installed - please install first ***]))
+AC_CHECK_HEADERS(tremor/ivorbiscodec.h tremor/ivorbisfile.h,,AC_MSG_ERROR([*** Tremor headers not installed - please install first ***]))
# Checks for libraries
AM_PATH_XMMS(1.2.4)

11
audio/xmms-tremor/patches/patch-src_fileinfo_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_fileinfo_c,v 1.1 2012/04/28 09:04:50 ajacoutot Exp $
--- src/fileinfo.c.orig Fri Apr 13 02:44:59 2012
+++ src/fileinfo.c Fri Apr 13 02:45:11 2012
@@ -28,7 +28,6 @@
#include <pthread.h>
#include <glib.h>
#include <gtk/gtk.h>
-#include <tremor/ogg.h>
#include <tremor/ivorbiscodec.h>
#include <tremor/ivorbisfile.h>

11
audio/xmms-tremor/patches/patch-src_vcedit_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_vcedit_c,v 1.1 2012/04/28 09:04:50 ajacoutot Exp $
--- src/vcedit.c.orig Fri Apr 13 02:46:48 2012
+++ src/vcedit.c Fri Apr 13 02:46:56 2012
@@ -13,7 +13,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <tremor/ogg.h>
#include <tremor/ivorbiscodec.h>
#include "vcedit.h"

11
audio/xmms-tremor/patches/patch-src_vcedit_h Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_vcedit_h,v 1.1 2012/04/28 09:04:50 ajacoutot Exp $
--- src/vcedit.h.orig Fri Apr 13 02:45:31 2012
+++ src/vcedit.h Fri Apr 13 02:45:44 2012
@@ -15,7 +15,6 @@ extern "C" {
#endif
#include <stdio.h>
-#include <tremor/ogg.h>
#include <tremor/ivorbiscodec.h>
typedef size_t (*vcedit_read_func)(void *, size_t, size_t, void *);

11
audio/xmms-tremor/patches/patch-src_vorbis_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_vorbis_c,v 1.1 2012/04/28 09:04:50 ajacoutot Exp $
--- src/vorbis.c.orig Fri Apr 13 02:47:14 2012
+++ src/vorbis.c Fri Apr 13 02:47:19 2012
@@ -32,7 +32,6 @@
#include <pthread.h>
#include <glib.h>
#include <gtk/gtk.h>
-#include <tremor/ogg.h>
#include <tremor/ivorbiscodec.h>
#include <tremor/ivorbisfile.h>

8
games/uqm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.29 2011/11/18 12:38:00 espie Exp $
# $OpenBSD: Makefile,v 1.30 2012/04/28 09:04:14 ajacoutot Exp $
COMMENT-main= ur-quan masters: sdl port of star control 2; multiplayer
COMMENT-content= ur-quan masters: game content
@ -23,7 +23,7 @@ SUPDISTFILES= ${MDIST} ${VDIST} ${RM1DIST} ${RM2DIST} ${RM3DIST}
DIST_SUBDIR= uqm
CATEGORIES= games x11
PKGNAME-main= uqm-0.6.2
REVISION-main = 1
REVISION-main = 2
PKGNAME-content= uqm-content-${VER}
PKGNAME-remix1= uqm-remix1-${VER}
PKGNAME-remix2= uqm-remix2-${VER}
@ -42,7 +42,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
LIB_DEPENDS-main= audio/libmikmod \
audio/tremor \
audio/tremor>=20120410 \
devel/sdl-image
PKG_ARCH-content= *
PKG_ARCH-remix1= *
@ -53,7 +53,7 @@ PKG_ARCH-voice= *
RUN_DEPENDS= ${PKGNAME-main}:games/uqm
RUN_DEPENDS-content=
RUN_DEPENDS-main= ${PKGNAME-content}:games/uqm,-content
WANTLIB-main= c m pthread z SDL mikmod>=2.4 vorbisidec>=1 \
WANTLIB-main= c m pthread z SDL mikmod>=2.4 vorbisidec>=3 \
SDL_image
NO_REGRESS= Yes

14
games/uqm/patches/patch-sc2_src_sc2code_libs_sound_decoders_oggaud_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-sc2_src_sc2code_libs_sound_decoders_oggaud_c,v 1.1 2012/04/28 09:04:14 ajacoutot Exp $
--- sc2/src/sc2code/libs/sound/decoders/oggaud.c.orig Fri Apr 13 01:18:24 2012
+++ sc2/src/sc2code/libs/sound/decoders/oggaud.c Fri Apr 13 01:28:54 2012
@@ -270,10 +270,6 @@ ova_GetFrame (THIS_PTR)
TFB_OggSoundDecoder* ova = (TFB_OggSoundDecoder*) This;
// this is the closest to a frame there is in ogg vorbis stream
// doesn't seem to be a func to retrive it
-#ifdef OVCODEC_TREMOR
- return ova->vf.os->pageno;
-#else
return ova->vf.os.pageno;
-#endif /* OVCODEC_TREMOR */
}

4
games/uqm/pkg/PLIST-main
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-main,v 1.2 2006/12/23 09:32:03 jolan Exp $
@comment $OpenBSD: PLIST-main,v 1.3 2012/04/28 09:04:14 ajacoutot Exp $
@pkgpath games/uqm
bin/uqm
@bin bin/uqm
share/doc/uqm/
share/doc/uqm/manual.txt

7
multimedia/gstreamer-0.10/plugins-base/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.48 2012/02/21 08:45:43 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.49 2012/04/28 09:03:45 ajacoutot Exp $
COMMENT-main = base elements for GStreamer
COMMENT-cdda = cd paranoia element for GStreamer (plugins-base)
@ -7,6 +7,7 @@ V = 0.10.36
DISTNAME = gst-plugins-base-${V}
PKGNAME-main = gstreamer-plugins-base-${V}
REVISION-main = 0
PKGNAME-cdda = gstreamer-cdda-${V}
MULTI_PACKAGES = -main -cdda
@ -46,14 +47,14 @@ WANTLIB-main += Xv Xxf86vm c cairo drm expat fontconfig freetype gio-2.0
WANTLIB-main += gstbase-0.10 gstcontroller-0.10 gstdataprotocol-0.10
WANTLIB-main += ogg orc-0.4 orc-test-0.4 pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB-main += pixman-1 png pthread pthread-stubs stdc++ theoradec
WANTLIB-main += theoraenc vorbis vorbisenc vorbisidec xcb xcb-render
WANTLIB-main += theoraenc vorbis vorbisenc vorbisidec>=3 xcb xcb-render
WANTLIB-main += xcb-shm
LIB_DEPENDS-main = ${LIB_DEPENDS} \
devel/orc>=0.4.11 \
audio/libvorbis \
devel/pango \
multimedia/libtheora \
audio/tremor
audio/tremor>=20120410
RUN_DEPENDS-main += ${MODGETTEXT_RUN_DEPENDS}
# needed for the gio plugin
RUN_DEPENDS-main += x11/gnome/gvfs

116
multimedia/gstreamer-0.10/plugins-base/patches/patch-ext_vorbis_gstvorbisdeclib_h Normal file
View File

@ -0,0 +1,116 @@
$OpenBSD: patch-ext_vorbis_gstvorbisdeclib_h,v 1.1 2012/04/28 09:03:45 ajacoutot Exp $
--- ext/vorbis/gstvorbisdeclib.h.orig Sun Dec 11 13:47:07 2011
+++ ext/vorbis/gstvorbisdeclib.h Fri Apr 13 02:05:04 2012
@@ -29,11 +29,6 @@
#ifndef TREMOR
-#include <vorbis/codec.h>
-
-typedef float vorbis_sample_t;
-typedef ogg_packet ogg_packet_wrapper;
-
#define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to float audio"
#define GST_VORBIS_DEC_SRC_CAPS \
@@ -47,6 +42,42 @@ typedef ogg_packet ogg_packet_wrap
#define GST_VORBIS_DEC_GLIB_TYPE_NAME GstVorbisDec
+#else /* TREMOR */
+
+#define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to integer audio"
+
+#define GST_VORBIS_DEC_SRC_CAPS \
+ GST_STATIC_CAPS ("audio/x-raw-int, " \
+ "rate = (int) [ 1, MAX ], " \
+ "channels = (int) [ 1, 6 ], " \
+ "endianness = (int) BYTE_ORDER, " \
+ "width = (int) { 16, 32 }, " \
+ "depth = (int) 16, " \
+ "signed = (boolean) true")
+
+#define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH (16)
+
+/* we need a different type name here */
+#define GST_VORBIS_DEC_GLIB_TYPE_NAME GstIVorbisDec
+
+/* and still have it compile */
+typedef struct _GstVorbisDec GstIVorbisDec;
+typedef struct _GstVorbisDecClass GstIVorbisDecClass;
+
+#endif /* TREMOR */
+
+#ifndef USE_TREMOLO
+
+#ifdef TREMOR
+ #include <tremor/ivorbiscodec.h>
+ typedef ogg_int32_t vorbis_sample_t;
+#else
+ #include <vorbis/codec.h>
+ typedef float vorbis_sample_t;
+#endif
+
+typedef ogg_packet ogg_packet_wrapper;
+
static inline guint8 *
gst_ogg_packet_data (ogg_packet * p)
{
@@ -72,17 +103,11 @@ gst_ogg_packet_from_wrapper (ogg_packet_wrapper * pack
return packet;
}
-#else
+#else /* USE_TREMOLO */
-#ifdef USE_TREMOLO
- #include <Tremolo/ivorbiscodec.h>
- #include <Tremolo/codec_internal.h>
- typedef ogg_int16_t vorbis_sample_t;
-#else
- #include <tremor/ivorbiscodec.h>
- typedef ogg_int32_t vorbis_sample_t;
-#endif
-
+#include <Tremolo/ivorbiscodec.h>
+#include <Tremolo/codec_internal.h>
+typedef ogg_int16_t vorbis_sample_t;
typedef struct _ogg_packet_wrapper ogg_packet_wrapper;
struct _ogg_packet_wrapper {
@@ -91,26 +116,6 @@ struct _ogg_packet_wrapper {
ogg_buffer buf;
};
-#define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to integer audio"
-
-#define GST_VORBIS_DEC_SRC_CAPS \
- GST_STATIC_CAPS ("audio/x-raw-int, " \
- "rate = (int) [ 1, MAX ], " \
- "channels = (int) [ 1, 6 ], " \
- "endianness = (int) BYTE_ORDER, " \
- "width = (int) { 16, 32 }, " \
- "depth = (int) 16, " \
- "signed = (boolean) true")
-
-#define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH (16)
-
-/* we need a different type name here */
-#define GST_VORBIS_DEC_GLIB_TYPE_NAME GstIVorbisDec
-
-/* and still have it compile */
-typedef struct _GstVorbisDec GstIVorbisDec;
-typedef struct _GstVorbisDecClass GstIVorbisDecClass;
-
/* compensate minor variation */
#define vorbis_synthesis(a, b) vorbis_synthesis (a, b, 1)
@@ -154,7 +159,7 @@ gst_ogg_packet_from_wrapper (ogg_packet_wrapper * pack
return &(packet->packet);
}
-#endif
+#endif /* USE_TREMOLO */
typedef void (*CopySampleFunc)(vorbis_sample_t *out, vorbis_sample_t **in,
guint samples, gint channels, gint width);