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

- use exact width data types for libfaad interaction

Browse Source 
- LIB_DEPENDS-faad libfaad >= 1.0
- bump PKGNAME-main and PKGNAME-${PLUGIN}
- remove unused PATCHLEVEL variable
- adjust WANTLIB-main and WANTLIB-gnome as per lib-depends-check
- sync patches with update-patches

OK naddy@
This commit is contained in:
jakemsr 2007-06-29 06:13:44 +00:00
parent 6ff93d9b44
commit 468e026756
7 changed files with 66 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devel/gstreamer-plugins/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.31 2007/05/23 18:43:38 jasper Exp $
# $OpenBSD: Makefile,v 1.32 2007/06/29 06:13:44 jakemsr Exp $
COMMENT-main= "GStreamer Streaming-media framework plug-ins."
VERSION= 0.8.11
PATCHLEVEL=
DISTNAME= gst-plugins-${VERSION}
PKGNAME-main= gstreamer-plugins-${VERSION}p14
PKGNAME-main= gstreamer-plugins-${VERSION}p15
# Don't forget about PKGNAME-${PLUGIN} (See below)
SHARED_LIBS= gstgconf-0.8 1.0 \
gstinterfaces-0.8 1.0 \
@ -58,6 +57,7 @@ myLIB_DEPENDS= gstreamer-0.8.>=5.0:gstreamer-0.8.*:devel/gstreamer \
${MODGETTEXT_LIB_DEPENDS}
WANTLIB-main= ICE SM X11 Xau Xdamage Xdmcp Xext Xfixes Xrender Xv \
Xcursor Xi Xinerama Xrandr \
expat fontconfig freetype ossaudio \
atk-1.0 ORBit-2 \
pango-1.0 pangoft2-1.0 pangocairo-1.0 \
@ -82,7 +82,7 @@ PLUGINS+= a52
PSEUDO_FLAVORS+= no_${PLUGIN}
. if !${FLAVOR:L:Mno_${PLUGIN}} && !${FLAVOR:L:Mminimal}
MULTI_PACKAGES+= -${PLUGIN}
PKGNAME-${PLUGIN}= gstreamer-${PLUGIN}-${VERSION}${PATCHLEVEL}p14
PKGNAME-${PLUGIN}= gstreamer-${PLUGIN}-${VERSION}p15
BASENAME-${PLUGIN}= gstreamer-${PLUGIN}
. endif
.endfor
@ -144,7 +144,7 @@ LIB_DEPENDS-esd= esd.>=2::audio/esound \
# faad
COMMENT-faad= "GStreamer plugin for decoding AAC files"
WANTLIB-faad= ${myWANTLIB}
LIB_DEPENDS-faad= faad::audio/faad \
LIB_DEPENDS-faad= faad.>=1::audio/faad \
${myLIB_DEPENDS}
# flac
@ -155,7 +155,7 @@ LIB_DEPENDS-flac= FLAC::audio/flac \
# gnomevfs
COMMENT-gnome= "GStreamer plugin supporting GNOME VFS"
WANTLIB-gnome= crypto ssl gconf-2 \
WANTLIB-gnome= ORBit-2 crypto ssl gconf-2 \
dbus-1 dbus-glib-1 util \
${myWANTLIB}
LIB_DEPENDS-gnome= gnomevfs-2.>=1800:gnome-vfs2->=2.18:x11/gnome/vfs2 \

39
devel/gstreamer-plugins/patches/patch-ext_faad_gstfaad_c Normal file
View File

@ -0,0 +1,39 @@
$OpenBSD: patch-ext_faad_gstfaad_c,v 1.1 2007/06/29 06:13:44 jakemsr Exp $
--- ext/faad/gstfaad.c.orig Fri Jun 1 22:25:24 2007
+++ ext/faad/gstfaad.c Fri Jun 1 22:33:43 2007
@@ -301,8 +301,8 @@ gst_faad_sinkconnect (GstPad * pad, const GstCaps * ca
faad->packetised = FALSE;
if ((value = gst_structure_get_value (str, "codec_data"))) {
- unsigned long samplerate;
- guchar channels;
+ guint32 samplerate;
+ guint8 channels;
/* We have codec data, means packetised stream */
faad->packetised = TRUE;
@@ -625,9 +625,9 @@ gst_faad_sync (GstBuffer * buf, guint * off)
static void
gst_faad_chain (GstPad * pad, GstData * data)
{
- guint input_size;
+ guint32 input_size;
guint skip_bytes = 0;
- guchar *input_data;
+ guint8 *input_data;
GstFaad *faad = GST_FAAD (gst_pad_get_parent (pad));
GstBuffer *buf, *outbuf;
faacDecFrameInfo info;
@@ -674,9 +674,9 @@ gst_faad_chain (GstPad * pad, GstData * data)
/* init if not already done during capsnego */
if (!faad->init) {
- unsigned long samplerate;
- guchar channels;
- glong init_res;
+ guint32 samplerate;
+ guint8 channels;
+ gint32 init_res;
init_res = faacDecInit (faad->handle, input_data, input_size,
&samplerate, &channels);

8
devel/gstreamer-plugins/patches/patch-gconf_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gconf_Makefile_in,v 1.4 2006/02/19 19:22:06 espie Exp $
--- gconf/Makefile.in.orig Sun Sep 4 14:19:41 2005
+++ gconf/Makefile.in Mon Dec 19 14:36:49 2005
@@ -851,13 +851,7 @@ gstreamer-@GST_MAJORMINOR@.schemas: gstr
$OpenBSD: patch-gconf_Makefile_in,v 1.5 2007/06/29 06:13:44 jakemsr Exp $
--- gconf/Makefile.in.orig Sun Sep 4 05:19:41 2005
+++ gconf/Makefile.in Fri Jun 1 22:17:42 2007
@@ -851,13 +851,7 @@ gstreamer-@GST_MAJORMINOR@.schemas: gstreamer.schemas
cp gstreamer.schemas gstreamer-@GST_MAJORMINOR@.schemas
install-data-local:

8
devel/gstreamer-plugins/patches/patch-sys_cdrom_gstcdplayer_ioctl_bsd_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sys_cdrom_gstcdplayer_ioctl_bsd_h,v 1.1.1.1 2004/12/22 06:09:18 marcm Exp $
--- sys/cdrom/gstcdplayer_ioctl_bsd.h.orig 2004-03-15 11:25:26.000000000 -0800
+++ sys/cdrom/gstcdplayer_ioctl_bsd.h 2004-04-05 22:28:22.000000000 -0700
@@ -224,6 +224,7 @@ gboolean cd_start(struct cd *cd,gint sta
$OpenBSD: patch-sys_cdrom_gstcdplayer_ioctl_bsd_h,v 1.2 2007/06/29 06:13:44 jakemsr Exp $
--- sys/cdrom/gstcdplayer_ioctl_bsd.h.orig Mon Mar 15 08:32:53 2004
+++ sys/cdrom/gstcdplayer_ioctl_bsd.h Fri Jun 1 22:17:42 2007
@@ -224,6 +224,7 @@ gboolean cd_start(struct cd *cd,gint start_track,gint
return FALSE;
}

8
devel/gstreamer-plugins/patches/patch-sys_oss_gstosselement_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sys_oss_gstosselement_c,v 1.2 2005/05/24 21:33:33 marcm Exp $
$OpenBSD: patch-sys_oss_gstosselement_c,v 1.3 2007/06/29 06:13:44 jakemsr Exp $
--- sys/oss/gstosselement.c.orig Tue Feb 22 07:23:05 2005
+++ sys/oss/gstosselement.c Mon Apr 11 15:06:16 2005
@@ -263,7 +263,7 @@ gst_osselement_class_probe_devices (GstO
+++ sys/oss/gstosselement.c Fri Jun 1 22:17:42 2007
@@ -263,7 +263,7 @@ gst_osselement_class_probe_devices (GstOssElementClass
if (!init && !check) {
#define MIXER 0
#define DSP 1
@ -10,7 +10,7 @@ $OpenBSD: patch-sys_oss_gstosselement_c,v 1.2 2005/05/24 21:33:33 marcm Exp $
,
{"/dev/sound/mixer", "/dev/sound/dsp"}
,
@@ -424,7 +424,7 @@ gst_ossprobe_interface_init (GstProperty
@@ -424,7 +424,7 @@ gst_ossprobe_interface_init (GstPropertyProbeInterface
static void
gst_osselement_init (GstOssElement * oss)
{

12
devel/gstreamer-plugins/patches/patch-sys_sunaudio_gstsunaudio_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-sys_sunaudio_gstsunaudio_c,v 1.2 2005/05/24 21:33:33 marcm Exp $
$OpenBSD: patch-sys_sunaudio_gstsunaudio_c,v 1.3 2007/06/29 06:13:44 jakemsr Exp $
--- sys/sunaudio/gstsunaudio.c.orig Wed Dec 15 10:23:31 2004
+++ sys/sunaudio/gstsunaudio.c Mon Apr 11 15:06:16 2005
+++ sys/sunaudio/gstsunaudio.c Fri Jun 1 22:17:43 2007
@@ -28,7 +28,10 @@
#include <string.h>
#include <unistd.h>
@ -12,7 +12,7 @@ $OpenBSD: patch-sys_sunaudio_gstsunaudio_c,v 1.2 2005/05/24 21:33:33 marcm Exp $
#include "gstsunelement.h"
#include "gstsunmixer.h"
#include "gstsunaudiosrc.h"
@@ -184,8 +187,8 @@ gst_sunaudiosink_class_init (GstSunAudio
@@ -184,8 +187,8 @@ gst_sunaudiosink_class_init (GstSunAudioSinkClass * kl
gstelement_class->change_state = gst_sunaudiosink_change_state;
g_object_class_install_property (gobject_class, ARG_DEVICE,
@ -23,7 +23,7 @@ $OpenBSD: patch-sys_sunaudio_gstsunaudio_c,v 1.2 2005/05/24 21:33:33 marcm Exp $
g_object_class_install_property (gobject_class, ARG_BUFFER_SIZE,
g_param_spec_int ("buffer_size", "Buffer Size", "Buffer Size",
1, G_MAXINT, 64, G_PARAM_READWRITE));
@@ -210,7 +213,7 @@ gst_sunaudiosink_init (GstSunAudioSink *
@@ -210,7 +213,7 @@ gst_sunaudiosink_init (GstSunAudioSink * sunaudiosink)
audiodev = g_getenv ("AUDIODEV");
if (audiodev == NULL)
@ -32,7 +32,7 @@ $OpenBSD: patch-sys_sunaudio_gstsunaudio_c,v 1.2 2005/05/24 21:33:33 marcm Exp $
sunaudiosink->device = g_strdup (audiodev);
}
@@ -296,10 +299,9 @@ gst_sunaudiosink_setparams (GstSunAudioS
@@ -296,10 +299,9 @@ gst_sunaudiosink_setparams (GstSunAudioSink * sunaudio
ainfo.play.sample_rate = sunaudiosink->rate;
ainfo.play.channels = sunaudiosink->channels;
ainfo.play.precision = sunaudiosink->width;
@ -44,7 +44,7 @@ $OpenBSD: patch-sys_sunaudio_gstsunaudio_c,v 1.2 2005/05/24 21:33:33 marcm Exp $
ret = ioctl (sunaudiosink->fd, AUDIO_SETINFO, &ainfo);
if (ret == -1) {
@@ -343,10 +345,6 @@ gst_sunaudiosink_open (GstSunAudioSink *
@@ -343,10 +345,6 @@ gst_sunaudiosink_open (GstSunAudioSink * sunaudiosink)
}
GST_INFO ("monitor_gain %d", sunaudiosink->info.monitor_gain);

6
devel/gstreamer-plugins/patches/patch-sys_sunaudio_gstsunmixer_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sys_sunaudio_gstsunmixer_c,v 1.2 2005/05/24 21:33:33 marcm Exp $
$OpenBSD: patch-sys_sunaudio_gstsunmixer_c,v 1.3 2007/06/29 06:13:44 jakemsr Exp $
--- sys/sunaudio/gstsunmixer.c.orig Wed Dec 22 06:49:06 2004
+++ sys/sunaudio/gstsunmixer.c Mon Apr 11 15:06:16 2005
@@ -284,12 +284,6 @@ gst_sunaudiomixer_set_mute (GstMixer * m
+++ sys/sunaudio/gstsunmixer.c Fri Jun 1 22:17:43 2007
@@ -284,12 +284,6 @@ gst_sunaudiomixer_set_mute (GstMixer * mixer,
AUDIO_INITINFO (&audioinfo);