diff options
Diffstat (limited to 'multimedia/gstreamer-plugins/files')
16 files changed, 0 insertions, 1198 deletions
diff --git a/multimedia/gstreamer-plugins/files/bsdi_dvd.h b/multimedia/gstreamer-plugins/files/bsdi_dvd.h deleted file mode 100644 index ff61ebd25..000000000 --- a/multimedia/gstreamer-plugins/files/bsdi_dvd.h +++ /dev/null @@ -1,340 +0,0 @@ -#ifndef _DVD_H_ -#define _DVD_H_ - -#include <sys/cdefs.h> -#include <machine/endian.h> -#include <sys/ioctl.h> - -__BEGIN_DECLS -int dvd_cdrom_ioctl(int, unsigned long, void *); -int cdrom_blocksize(int, int); -void dvd_cdrom_debug(int); -__END_DECLS - -#define ioctl(a,b,c) dvd_cdrom_ioctl((a),(b),(c)) - -typedef unsigned char __u8; -typedef unsigned short __u16; -typedef unsigned int __u32; - -#define DVD_READ_STRUCT 0x5390 /* Read structure */ -#define DVD_WRITE_STRUCT 0x5391 /* Write structure */ -#define DVD_AUTH 0x5392 /* Authentication */ - -#define DVD_STRUCT_PHYSICAL 0x00 -#define DVD_STRUCT_COPYRIGHT 0x01 -#define DVD_STRUCT_DISCKEY 0x02 -#define DVD_STRUCT_BCA 0x03 -#define DVD_STRUCT_MANUFACT 0x04 - -struct dvd_layer { - __u8 book_version : 4; - __u8 book_type : 4; - __u8 min_rate : 4; - __u8 disc_size : 4; - __u8 layer_type : 4; - __u8 track_path : 1; - __u8 nlayers : 2; - __u8 track_density : 4; - __u8 linear_density : 4; - __u8 bca : 1; - __u32 start_sector; - __u32 end_sector; - __u32 end_sector_l0; -}; - -struct dvd_physical { - __u8 type; - __u8 layer_num; - struct dvd_layer layer[4]; -}; - -struct dvd_copyright { - __u8 type; - - __u8 layer_num; - __u8 cpst; - __u8 rmi; -}; - -struct dvd_disckey { - __u8 type; - - unsigned agid : 2; - __u8 value[2048]; -}; - -struct dvd_bca { - __u8 type; - - int len; - __u8 value[188]; -}; - -struct dvd_manufact { - __u8 type; - - __u8 layer_num; - int len; - __u8 value[2048]; -}; - -typedef union { - __u8 type; - - struct dvd_physical physical; - struct dvd_copyright copyright; - struct dvd_disckey disckey; - struct dvd_bca bca; - struct dvd_manufact manufact; -} dvd_struct; - -/* - * DVD authentication ioctl - */ - -/* Authentication states */ -#define DVD_LU_SEND_AGID 0 -#define DVD_HOST_SEND_CHALLENGE 1 -#define DVD_LU_SEND_KEY1 2 -#define DVD_LU_SEND_CHALLENGE 3 -#define DVD_HOST_SEND_KEY2 4 - -/* Termination states */ -#define DVD_AUTH_ESTABLISHED 5 -#define DVD_AUTH_FAILURE 6 - -/* Other functions */ -#define DVD_LU_SEND_TITLE_KEY 7 -#define DVD_LU_SEND_ASF 8 -#define DVD_INVALIDATE_AGID 9 -#define DVD_LU_SEND_RPC_STATE 10 -#define DVD_HOST_SEND_RPC_STATE 11 - -/* State data */ -typedef __u8 dvd_key[5]; /* 40-bit value, MSB is first elem. */ -typedef __u8 dvd_challenge[10]; /* 80-bit value, MSB is first elem. */ - -struct dvd_lu_send_agid { - __u8 type; - unsigned agid : 2; -}; - -struct dvd_host_send_challenge { - __u8 type; - unsigned agid : 2; - - dvd_challenge chal; -}; - -struct dvd_send_key { - __u8 type; - unsigned agid : 2; - - dvd_key key; -}; - -struct dvd_lu_send_challenge { - __u8 type; - unsigned agid : 2; - - dvd_challenge chal; -}; - -#define DVD_CPM_NO_COPYRIGHT 0 -#define DVD_CPM_COPYRIGHTED 1 - -#define DVD_CP_SEC_NONE 0 -#define DVD_CP_SEC_EXIST 1 - -#define DVD_CGMS_UNRESTRICTED 0 -#define DVD_CGMS_SINGLE 2 -#define DVD_CGMS_RESTRICTED 3 - -struct dvd_lu_send_title_key { - __u8 type; - unsigned agid : 2; - - dvd_key title_key; - int lba; - unsigned cpm : 1; - unsigned cp_sec : 1; - unsigned cgms : 2; -}; - -struct dvd_lu_send_asf { - __u8 type; - unsigned agid : 2; - - unsigned asf : 1; -}; - -struct dvd_host_send_rpcstate { - __u8 type; - __u8 pdrc; -}; - -struct dvd_lu_send_rpcstate { - __u8 type : 2; - __u8 vra : 3; - __u8 ucca : 3; - __u8 region_mask; - __u8 rpc_scheme; -}; - -typedef union { - __u8 type; - - struct dvd_lu_send_agid lsa; - struct dvd_host_send_challenge hsc; - struct dvd_send_key lsk; - struct dvd_lu_send_challenge lsc; - struct dvd_send_key hsk; - struct dvd_lu_send_title_key lstk; - struct dvd_lu_send_asf lsasf; - struct dvd_host_send_rpcstate hrpcs; - struct dvd_lu_send_rpcstate lrpcs; -} dvd_authinfo; - - -typedef struct { - __u16 report_key_length; - __u8 reserved1; - __u8 reserved2; -#if BYTE_ORDER == BIG_ENDIAN - __u8 type_code : 2; - __u8 vra : 3; - __u8 ucca : 3; -#elif BYTE_ORDER == LITTLE_ENDIAN - __u8 ucca : 3; - __u8 vra : 3; - __u8 type_code : 2; -#endif - __u8 region_mask; - __u8 rpc_scheme; - __u8 reserved3; -} rpc_state_t; - -/* - * Stuff for the CDROM ioctls -*/ - -#define CDROMREADTOCHDR 0x5305 /* Read TOC header (cdrom_tochdr) */ -#define CDROMREADTOCENTRY 0x5306 /* Read TOC entry (cdrom_tocentry) */ -#define CDROMEJECT 0x5309 /* Ejects the cdrom media */ -#define CDROMCLOSETRAY 0x5319 /* Reverse of CDROMEJECT */ -#define CDROM_DRIVE_STATUS 0x5326 /* Get tray position, etc. */ -#define CDROM_DISC_STATUS 0x5327 /* Get disc type, etc. */ -#define CDROMREADMODE2 0x530c /* Read CDROM mode 2 data (2336 Bytes) */ -#define CDROMREADMODE1 0x530d /* Read CDROM mode 1 data (2048 Bytes) */ -#define CDROMREADRAW 0x5314 /* read data in raw mode (2352 bytes) */ - -#define CD_MINS 74 /* max. minutes per CD, not really a limit */ -#define CD_SECS 60 /* seconds per minute */ -#define CD_FRAMES 75 /* frames per second */ -#define CD_MSF_OFFSET 150 /* MSF numbering offset of first frame */ - -#define CD_HEAD_SIZE 4 /* header (address) bytes per raw data frame */ -#define CD_SYNC_SIZE 12 /* 12 sync bytes per raw data frame */ -#define CD_FRAMESIZE 2048 /* bytes per frame, "cooked" mode */ -#define CD_FRAMESIZE_RAW 2352 /* bytes per frame, "raw" mode */ -#define CD_FRAMESIZE_RAW0 (CD_FRAMESIZE_RAW-CD_SYNC_SIZE-CD_HEAD_SIZE) /*2336*/ -#define CD_FRAMESIZE_RAW1 (CD_FRAMESIZE_RAW-CD_SYNC_SIZE) /*2340*/ - -/* CD-ROM address types (cdrom_tocentry.cdte_format) */ -#define CDROM_LBA 0x01 /* logical block: first frame is #0 */ -#define CDROM_MSF 0x02 /* minute-second-frame: binary. not bcd here!*/ - -/* bit to tell whether track is data or audio (cdrom_tocentry.cdte_ctrl) */ -#define CDROM_DATA_TRACK 0x04 - -/* The leadout track is always 0xAA, regardless of # of tracks on disc */ -#define CDROM_LEADOUT 0xAA - -/* drive status returned by CDROM_DRIVE_STATUS ioctl */ -#define CDS_NO_INFO 0 /* if not implemented */ -#define CDS_NO_DISC 1 -#define CDS_TRAY_OPEN 2 -#define CDS_DRIVE_NOT_READY 3 -#define CDS_DISC_OK 4 - -/* - * Return values for CDROM_DISC_STATUS ioctl. - * Can also return CDS_NO_INFO and CDS_NO_DISC from above -*/ -#define CDS_AUDIO 100 -#define CDS_DATA_1 101 -#define CDS_DATA_2 102 -#define CDS_XA_2_1 103 -#define CDS_XA_2_2 104 -#define CDS_MIXED 105 - -/* For compile compatibility only - we don't support changers */ -#define CDSL_NONE ((int) (~0U>>1)-1) -#define CDSL_CURRENT ((int) (~0U>>1)) - -struct cdrom_msf -{ - __u8 cdmsf_min0; /* start minute */ - __u8 cdmsf_sec0; /* start second */ - __u8 cdmsf_frame0; /* start frame */ - __u8 cdmsf_min1; /* end minute */ - __u8 cdmsf_sec1; /* end second */ - __u8 cdmsf_frame1; /* end frame */ -}; - -struct cdrom_tochdr - { - __u8 cdth_trk0; /* start track */ - __u8 cdth_trk1; /* end track */ - }; - -struct cdrom_msf0 -{ - __u8 minute; - __u8 second; - __u8 frame; -}; - -union cdrom_addr -{ - struct cdrom_msf0 msf; - int lba; -}; - -struct cdrom_tocentry -{ - __u8 cdte_track; - __u8 cdte_adr :4; - __u8 cdte_ctrl :4; - __u8 cdte_format; - union cdrom_addr cdte_addr; - __u8 cdte_datamode; -}; - -struct modesel_head -{ - __u8 reserved1; - __u8 medium; - __u8 reserved2; - __u8 block_desc_length; - __u8 density; - __u8 number_of_blocks_hi; - __u8 number_of_blocks_med; - __u8 number_of_blocks_lo; - __u8 reserved3; - __u8 block_length_hi; - __u8 block_length_med; - __u8 block_length_lo; -}; - -typedef struct -{ - int data; - int audio; - int cdi; - int xa; - int error; -} tracktype; - -#endif /* _DVD_H_ */ diff --git a/multimedia/gstreamer-plugins/files/patch-configure b/multimedia/gstreamer-plugins/files/patch-configure deleted file mode 100644 index 92b1deb51..000000000 --- a/multimedia/gstreamer-plugins/files/patch-configure +++ /dev/null @@ -1,12 +0,0 @@ ---- configure.orig Wed Jun 23 21:30:24 2004 -+++ configure Wed Jun 23 21:30:25 2004 -@@ -46068,7 +46068,8 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-laudio $X_LIBS $LIBS" -+#xxx fix the non x case is er niet... -+LIBS="-laudio -lm -lXt $X_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF diff --git a/multimedia/gstreamer-plugins/files/patch-ext::ivorbis::vorbisenc.h b/multimedia/gstreamer-plugins/files/patch-ext::ivorbis::vorbisenc.h deleted file mode 100644 index 90d39a1a2..000000000 --- a/multimedia/gstreamer-plugins/files/patch-ext::ivorbis::vorbisenc.h +++ /dev/null @@ -1,103 +0,0 @@ ---- /dev/null Thu Feb 12 22:22:00 2004 -+++ ext/ivorbis/vorbisenc.h Thu Feb 12 22:24:08 2004 -@@ -0,0 +1,100 @@ -+/* GStreamer -+ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+ -+#ifndef __VORBISENC_H__ -+#define __VORBISENC_H__ -+ -+ -+#include <gst/gst.h> -+ -+#include <tremor/ivorbiscodec.h> -+ -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ -+#define GST_TYPE_VORBISENC \ -+ (vorbisenc_get_type()) -+#define GST_VORBISENC(obj) \ -+ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VORBISENC,VorbisEnc)) -+#define GST_VORBISENC_CLASS(klass) \ -+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VORBISENC,VorbisEncClass)) -+#define GST_IS_VORBISENC(obj) \ -+ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VORBISENC)) -+#define GST_IS_VORBISENC_CLASS(obj) \ -+ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VORBISENC)) -+ -+typedef struct _VorbisEnc VorbisEnc; -+typedef struct _VorbisEncClass VorbisEncClass; -+ -+struct _VorbisEnc { -+ GstElement element; -+ -+ GstPad *sinkpad, -+ *srcpad; -+ -+ ogg_stream_state os; /* take physical pages, weld into a logical -+ stream of packets */ -+ ogg_page og; /* one Ogg bitstream page. Vorbis packets are inside */ -+ ogg_packet op; /* one raw packet of data for decode */ -+ -+ vorbis_info vi; /* struct that stores all the static vorbis bitstream -+ settings */ -+ vorbis_comment vc; /* struct that stores all the user comments */ -+ -+ vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */ -+ vorbis_block vb; /* local working space for packet->PCM decode */ -+ -+ gboolean eos; -+ -+ gboolean managed; -+ gint bitrate; -+ gint min_bitrate; -+ gint max_bitrate; -+ gfloat quality; -+ gboolean quality_set; -+ gint serial; -+ -+ gint channels; -+ gint frequency; -+ -+ guint64 samples_in; -+ guint64 bytes_out; -+ -+ GstCaps *metadata; -+ -+ gboolean setup; -+ gboolean flush_header; -+ gchar *last_message; -+}; -+ -+struct _VorbisEncClass { -+ GstElementClass parent_class; -+}; -+ -+GType vorbisenc_get_type(void); -+ -+ -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ -+ -+ -+#endif /* __VORBISENC_H__ */ diff --git a/multimedia/gstreamer-plugins/files/patch-ext_cairo_gstcairo.c b/multimedia/gstreamer-plugins/files/patch-ext_cairo_gstcairo.c deleted file mode 100644 index 788e2df28..000000000 --- a/multimedia/gstreamer-plugins/files/patch-ext_cairo_gstcairo.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ext/cairo/gstcairo.c.orig Sun Jun 12 10:43:25 2005 -+++ ext/cairo/gstcairo.c Sun Jun 12 10:44:04 2005 -@@ -46,5 +46,5 @@ - return TRUE; - } - --GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, "timeoverlay", -- "Time overlay", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN) -+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, "cairo", -+ "Cairo", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN) diff --git a/multimedia/gstreamer-plugins/files/patch-ext_cairo_gsttextoverlay.c b/multimedia/gstreamer-plugins/files/patch-ext_cairo_gsttextoverlay.c deleted file mode 100644 index 7da96c50b..000000000 --- a/multimedia/gstreamer-plugins/files/patch-ext_cairo_gsttextoverlay.c +++ /dev/null @@ -1,249 +0,0 @@ ---- ext/cairo/gsttextoverlay.c.orig Sun Jun 12 10:43:32 2005 -+++ ext/cairo/gsttextoverlay.c Sun Jun 12 10:44:04 2005 -@@ -84,18 +84,9 @@ - - static GstElementClass *parent_class = NULL; - --/*static guint gst_textoverlay_signals[LAST_SIGNAL] = { 0 }; */ -- --/* This is for cairo 0.4, remove once we require 0.5 */ --#ifndef CAIRO_API_SHAKEUP_FLAG_DAY --#define cairo_set_source_rgba(cr,red,green,blue,alpha) {\ -- cairo_set_rgb_color(cr,red,green,blue); \ -- cairo_set_alpha(cr,alpha); } --#endif -- - - GType --gst_textoverlay_get_type (void) -+gst_cairotextoverlay_get_type (void) - { - static GType textoverlay_type = 0; - -@@ -113,7 +104,7 @@ - }; - - textoverlay_type = -- g_type_register_static (GST_TYPE_ELEMENT, "GstTextOverlay", -+ g_type_register_static (GST_TYPE_ELEMENT, "GstCairoTextOverlay", - &textoverlay_info, 0); - } - return textoverlay_type; -@@ -221,30 +212,37 @@ - int textlen) - { - cairo_text_extents_t extents; -+ cairo_surface_t *surface; -+ cairo_t *cr; - char *string; - double x, y; - - string = g_strndup (text, textlen); - -- if (overlay->text_fill_image) -- g_free (overlay->text_fill_image); - overlay->text_fill_image = -- g_malloc (4 * overlay->width * overlay->text_height); -- cairo_set_target_image (overlay->cr, (gchar *) overlay->text_fill_image, -+ g_realloc (overlay->text_fill_image, -+ 4 * overlay->width * overlay->text_height); -+ -+ surface = cairo_image_surface_create_for_data (overlay->text_fill_image, - CAIRO_FORMAT_ARGB32, overlay->width, overlay->text_height, - overlay->width * 4); - -- cairo_save (overlay->cr); -- cairo_rectangle (overlay->cr, 0, 0, overlay->width, overlay->text_height); -- cairo_set_source_rgba (overlay->cr, 0, 0, 0, 1.0); -- -- cairo_set_operator (overlay->cr, CAIRO_OPERATOR_SRC); -- cairo_fill (overlay->cr); -- cairo_restore (overlay->cr); -- -- cairo_save (overlay->cr); -- cairo_text_extents (overlay->cr, (guchar *) string, &extents); -- cairo_set_source_rgba (overlay->cr, 1, 1, 1, 1.0); -+ cr = cairo_create (surface); -+ -+ cairo_select_font_face (cr, overlay->font, overlay->slant, overlay->weight); -+ cairo_set_font_size (cr, overlay->scale); -+ -+ cairo_save (cr); -+ cairo_rectangle (cr, 0, 0, overlay->width, overlay->text_height); -+ cairo_set_source_rgba (cr, 0, 0, 0, 1.0); -+ -+ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); -+ cairo_fill (cr); -+ cairo_restore (cr); -+ -+ cairo_save (cr); -+ cairo_text_extents (cr, string, &extents); -+ cairo_set_source_rgba (cr, 1, 1, 1, 1.0); - - switch (overlay->halign) { - case GST_TEXT_OVERLAY_HALIGN_LEFT: -@@ -260,42 +258,53 @@ - x = 0; - } - y = overlay->text_height - 2; -- cairo_move_to (overlay->cr, x, y); -- cairo_show_text (overlay->cr, (guchar *) string); -- cairo_restore (overlay->cr); -+ cairo_move_to (cr, x, y); -+ cairo_show_text (cr, string); -+ cairo_restore (cr); -+ -+ cairo_destroy (cr); -+ cairo_surface_destroy (surface); -+ -+ /* ----------- */ - -- if (overlay->text_outline_image) -- g_free (overlay->text_outline_image); - overlay->text_outline_image = -- g_malloc (4 * overlay->width * overlay->text_height); -- cairo_set_target_image (overlay->cr, (gchar *) overlay->text_outline_image, -+ g_realloc (overlay->text_outline_image, -+ 4 * overlay->width * overlay->text_height); -+ -+ surface = cairo_image_surface_create_for_data (overlay->text_outline_image, - CAIRO_FORMAT_ARGB32, overlay->width, overlay->text_height, - overlay->width * 4); - -- cairo_save (overlay->cr); -- cairo_rectangle (overlay->cr, 0, 0, overlay->width, overlay->text_height); -- cairo_set_source_rgba (overlay->cr, 0, 0, 0, 1.0); -- cairo_set_operator (overlay->cr, CAIRO_OPERATOR_SRC); -- cairo_fill (overlay->cr); -- cairo_restore (overlay->cr); -- -- cairo_save (overlay->cr); -- cairo_move_to (overlay->cr, x, y); -- cairo_set_source_rgba (overlay->cr, 1, 1, 1, 1.0); -- cairo_set_line_width (overlay->cr, 1.0); -- cairo_text_path (overlay->cr, (guchar *) string); -- cairo_stroke (overlay->cr); -- cairo_restore (overlay->cr); -+ cr = cairo_create (surface); - -- g_free (string); --} -+ cairo_select_font_face (cr, overlay->font, overlay->slant, overlay->weight); -+ cairo_set_font_size (cr, overlay->scale); - --/* static GstPadLinkReturn */ --/* gst_textoverlay_text_sinkconnect (GstPad *pad, GstCaps *caps) */ --/* { */ --/* return GST_PAD_LINK_DONE; */ --/* } */ -+/* -+ cairo_set_target_image (cr, (gchar*) overlay->text_outline_image, -+ CAIRO_FORMAT_ARGB32, overlay->width, overlay->text_height, -+ overlay->width * 4); -+*/ -+ cairo_save (cr); -+ cairo_rectangle (cr, 0, 0, overlay->width, overlay->text_height); -+ cairo_set_source_rgba (cr, 0, 0, 0, 1.0); -+ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); -+ cairo_fill (cr); -+ cairo_restore (cr); -+ -+ cairo_save (cr); -+ cairo_move_to (cr, x, y); -+ cairo_set_source_rgba (cr, 1, 1, 1, 1.0); -+ cairo_set_line_width (cr, 1.0); -+ cairo_text_path (cr, (guchar *) string); -+ cairo_stroke (cr); -+ cairo_restore (cr); -+ -+ g_free (string); - -+ cairo_destroy (cr); -+ cairo_surface_destroy (surface); -+} - - static GstPadLinkReturn - gst_textoverlay_video_sinkconnect (GstPad * pad, const GstCaps * caps) -@@ -542,17 +551,24 @@ - gst_textoverlay_font_init (GstTextOverlay * overlay) - { - cairo_font_extents_t font_extents; -+ cairo_surface_t *surface; -+ cairo_t *cr; -+ -+ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 64, 64); -+ cr = cairo_create (surface); - -- cairo_select_font (overlay->cr, overlay->font, overlay->slant, -- overlay->weight); -- cairo_scale_font (overlay->cr, overlay->scale); -+ cairo_select_font_face (cr, overlay->font, overlay->slant, overlay->weight); -+ cairo_set_font_size (cr, overlay->scale); - -- cairo_current_font_extents (overlay->cr, &font_extents); -+ cairo_font_extents (cr, &font_extents); - overlay->text_height = font_extents.height; - if (overlay->text_height & 1) - overlay->text_height++; - - overlay->need_render = TRUE; -+ -+ cairo_destroy (cr); -+ cairo_surface_destroy (surface); - } - - static GstElementStateReturn -@@ -581,10 +597,8 @@ - { - GstTextOverlay *overlay = GST_TEXTOVERLAY (object); - -- if (overlay->cr) { -- cairo_destroy (overlay->cr); -- } -- -+ g_free (overlay->font); -+ g_free (overlay->default_text); - G_OBJECT_CLASS (parent_class)->finalize (object); - } - -@@ -611,8 +625,6 @@ - (&textoverlay_src_template_factory), "src"); - gst_element_add_pad (GST_ELEMENT (overlay), overlay->srcpad); - -- overlay->cr = cairo_create (); -- - overlay->halign = GST_TEXT_OVERLAY_HALIGN_CENTER; - overlay->valign = GST_TEXT_OVERLAY_VALIGN_BASELINE; - overlay->x0 = overlay->y0 = 25; -@@ -635,17 +647,14 @@ - { - GstTextOverlay *overlay; - -- /* it's not null if we got it, but it might not be ours */ - g_return_if_fail (GST_IS_TEXTOVERLAY (object)); - overlay = GST_TEXTOVERLAY (object); - - switch (prop_id) { - - case ARG_TEXT: -- if (overlay->default_text) { -- g_free (overlay->default_text); -- } -- overlay->default_text = g_strdup (g_value_get_string (value)); -+ g_free (overlay->default_text); -+ overlay->default_text = g_value_dup_string (value); - overlay->need_render = TRUE; - break; - -@@ -684,9 +693,8 @@ - break; - - case ARG_FONT_DESC: -- if (overlay->font) -- g_free (overlay->font); -- overlay->font = g_strdup (g_value_get_string (value)); -+ g_free (overlay->font); -+ overlay->font = g_value_dup_string (value); - gst_textoverlay_font_init (overlay); - break; - diff --git a/multimedia/gstreamer-plugins/files/patch-ext_cairo_gsttextoverlay.h b/multimedia/gstreamer-plugins/files/patch-ext_cairo_gsttextoverlay.h deleted file mode 100644 index a27e832a9..000000000 --- a/multimedia/gstreamer-plugins/files/patch-ext_cairo_gsttextoverlay.h +++ /dev/null @@ -1,28 +0,0 @@ ---- ext/cairo/gsttextoverlay.h.orig Sun Jun 12 10:43:36 2005 -+++ ext/cairo/gsttextoverlay.h Sun Jun 12 10:44:04 2005 -@@ -10,7 +10,7 @@ - GST_DEBUG_CATEGORY_EXTERN (cairo_debug); - #define GST_CAT_DEFAULT cairo_debug - --#define GST_TYPE_TEXTOVERLAY (gst_textoverlay_get_type()) -+#define GST_TYPE_TEXTOVERLAY (gst_cairotextoverlay_get_type()) - #define GST_TEXTOVERLAY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\ - GST_TYPE_TEXTOVERLAY, GstTextOverlay)) - #define GST_TEXTOVERLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),\ -@@ -56,7 +56,6 @@ - gint y0; - gchar *default_text; - -- cairo_t *cr; - guchar *text_fill_image; - guchar *text_outline_image; - int text_height; -@@ -75,7 +74,7 @@ - GstElementClass parent_class; - }; - --GType gst_textoverlay_get_type(void) G_GNUC_CONST; -+GType gst_cairotextoverlay_get_type(void) G_GNUC_CONST; - - G_END_DECLS - diff --git a/multimedia/gstreamer-plugins/files/patch-ext_cairo_gsttimeoverlay.c b/multimedia/gstreamer-plugins/files/patch-ext_cairo_gsttimeoverlay.c deleted file mode 100644 index 355f4ec32..000000000 --- a/multimedia/gstreamer-plugins/files/patch-ext_cairo_gsttimeoverlay.c +++ /dev/null @@ -1,233 +0,0 @@ ---- ext/cairo/gsttimeoverlay.c.orig Sun Jun 12 10:43:45 2005 -+++ ext/cairo/gsttimeoverlay.c Sun Jun 12 10:44:04 2005 -@@ -34,41 +34,16 @@ - - #include <cairo.h> - --/* This is for cairo 0.4, remove once we require 0.5 */ --#ifndef CAIRO_API_SHAKEUP_FLAG_DAY --#define cairo_set_source_rgba(cr,red,green,blue,alpha) {\ -- cairo_set_rgb_color(cr,red,green,blue); \ -- cairo_set_alpha(cr,alpha); } --#endif -- --/* GstTimeoverlay signals and args */ --enum --{ -- /* FILL ME */ -- LAST_SIGNAL --}; -- --enum --{ -- ARG_0 -- /* FILL ME */ --}; -- - static void gst_timeoverlay_base_init (gpointer g_class); - static void gst_timeoverlay_class_init (gpointer g_class, gpointer class_data); - static void gst_timeoverlay_init (GTypeInstance * instance, gpointer g_class); - --static void gst_timeoverlay_set_property (GObject * object, guint prop_id, -- const GValue * value, GParamSpec * pspec); --static void gst_timeoverlay_get_property (GObject * object, guint prop_id, -- GValue * value, GParamSpec * pspec); -- - static void gst_timeoverlay_planar411 (GstVideofilter * videofilter, void *dest, - void *src); - static void gst_timeoverlay_setup (GstVideofilter * videofilter); - - GType --gst_timeoverlay_get_type (void) -+gst_cairotimeoverlay_get_type (void) - { - static GType timeoverlay_type = 0; - -@@ -86,7 +61,7 @@ - }; - - timeoverlay_type = g_type_register_static (GST_TYPE_VIDEOFILTER, -- "GstTimeoverlay", &timeoverlay_info, 0); -+ "GstCairoTimeOverlay", &timeoverlay_info, 0); - } - return timeoverlay_type; - } -@@ -127,16 +102,6 @@ - gobject_class = G_OBJECT_CLASS (g_class); - videofilter_class = GST_VIDEOFILTER_CLASS (g_class); - --#if 0 -- g_object_class_install_property (gobject_class, ARG_METHOD, -- g_param_spec_enum ("method", "method", "method", -- GST_TYPE_TIMEOVERLAY_METHOD, GST_TIMEOVERLAY_METHOD_1, -- G_PARAM_READWRITE)); --#endif -- -- gobject_class->set_property = gst_timeoverlay_set_property; -- gobject_class->get_property = gst_timeoverlay_get_property; -- - videofilter_class->setup = gst_timeoverlay_setup; - } - -@@ -154,70 +119,29 @@ - } - - static void --gst_timeoverlay_set_property (GObject * object, guint prop_id, -- const GValue * value, GParamSpec * pspec) --{ -- GstTimeoverlay *src; -- -- /* it's not null if we got it, but it might not be ours */ -- g_return_if_fail (GST_IS_TIMEOVERLAY (object)); -- src = GST_TIMEOVERLAY (object); -- -- GST_DEBUG ("gst_timeoverlay_set_property"); -- switch (prop_id) { --#if 0 -- case ARG_METHOD: -- src->method = g_value_get_enum (value); -- break; --#endif -- default: -- break; -- } --} -- --static void --gst_timeoverlay_get_property (GObject * object, guint prop_id, GValue * value, -- GParamSpec * pspec) --{ -- GstTimeoverlay *src; -- -- /* it's not null if we got it, but it might not be ours */ -- g_return_if_fail (GST_IS_TIMEOVERLAY (object)); -- src = GST_TIMEOVERLAY (object); -- -- switch (prop_id) { --#if 0 -- case ARG_METHOD: -- g_value_set_enum (value, src->method); -- break; --#endif -- default: -- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -- break; -- } --} -- --static void - gst_timeoverlay_setup (GstVideofilter * videofilter) - { - GstTimeoverlay *timeoverlay; - cairo_font_extents_t font_extents; -+ cairo_surface_t *surface; -+ cairo_t *cr; - - g_return_if_fail (GST_IS_TIMEOVERLAY (videofilter)); - timeoverlay = GST_TIMEOVERLAY (videofilter); - -- /* if any setup needs to be done, do it here */ -- -- timeoverlay->cr = cairo_create (); -+ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 64, 64); -+ cr = cairo_create (surface); - -- cairo_set_rgb_color (timeoverlay->cr, 0, 0, 0); -+ cairo_set_source_rgb (cr, 0, 0, 0); - -- cairo_select_font (timeoverlay->cr, "monospace", 0, 0); -- cairo_scale_font (timeoverlay->cr, 20); -+ cairo_select_font_face (cr, "monospace", 0, 0); -+ cairo_set_font_size (cr, 20); - -- cairo_current_font_extents (timeoverlay->cr, &font_extents); -+ cairo_font_extents (cr, &font_extents); - timeoverlay->text_height = font_extents.height; - -+ cairo_destroy (cr); -+ cairo_surface_destroy (surface); - } - - static char * -@@ -251,8 +175,10 @@ - int b_width; - char *string; - int i, j; -- char *image; -+ unsigned char *image; - cairo_text_extents_t extents; -+ cairo_surface_t *surface; -+ cairo_t *cr; - - g_return_if_fail (GST_IS_TIMEOVERLAY (videofilter)); - timeoverlay = GST_TIMEOVERLAY (videofilter); -@@ -266,32 +192,40 @@ - - image = g_malloc (4 * width * timeoverlay->text_height); - -- cairo_set_target_image (timeoverlay->cr, image, CAIRO_FORMAT_ARGB32, -+ surface = cairo_image_surface_create_for_data (image, CAIRO_FORMAT_ARGB32, - width, timeoverlay->text_height, width * 4); - -- cairo_save (timeoverlay->cr); -- cairo_rectangle (timeoverlay->cr, 0, 0, width, timeoverlay->text_height); -- cairo_set_source_rgba (timeoverlay->cr, 0, 0, 0, 0); -- -- cairo_set_operator (timeoverlay->cr, CAIRO_OPERATOR_SRC); -- cairo_fill (timeoverlay->cr); -- cairo_restore (timeoverlay->cr); -- -- cairo_save (timeoverlay->cr); -- cairo_text_extents (timeoverlay->cr, (guchar *) string, &extents); -- -- cairo_set_rgb_color (timeoverlay->cr, 1, 1, 1); -- cairo_move_to (timeoverlay->cr, 0, timeoverlay->text_height - 2); -- cairo_show_text (timeoverlay->cr, (guchar *) string); -+ cr = cairo_create (surface); -+ -+ cairo_set_source_rgb (cr, 0, 0, 0); -+ cairo_select_font_face (cr, "monospace", 0, 0); -+ cairo_set_font_size (cr, 20); -+ -+ cairo_save (cr); -+ -+ cairo_rectangle (cr, 0, 0, width, timeoverlay->text_height); -+ cairo_set_source_rgba (cr, 0, 0, 0, 0); -+ -+ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); -+ cairo_fill (cr); -+ cairo_restore (cr); -+ -+ cairo_save (cr); -+ cairo_text_extents (cr, string, &extents); -+ -+ cairo_set_source_rgb (cr, 1, 1, 1); -+ cairo_move_to (cr, 0, timeoverlay->text_height - 2); -+ cairo_show_text (cr, string); - g_free (string); -+ - #if 0 -- cairo_text_path (timeoverlay->cr, string); -- cairo_set_rgb_color (timeoverlay->cr, 1, 1, 1); -- cairo_set_line_width (timeoverlay->cr, 1.0); -- cairo_stroke (timeoverlay->cr); -+ cairo_text_path (cr, string); -+ cairo_set_source_rgb (cr, 1, 1, 1); -+ cairo_set_line_width (cr, 1.0); -+ cairo_stroke (cr); - #endif - -- cairo_restore (timeoverlay->cr); -+ cairo_restore (cr); - - b_width = extents.width; - if (b_width > width) -@@ -310,4 +244,7 @@ - } - - g_free (image); -+ -+ cairo_destroy (cr); -+ cairo_surface_destroy (surface); - } diff --git a/multimedia/gstreamer-plugins/files/patch-ext_cairo_gsttimeoverlay.h b/multimedia/gstreamer-plugins/files/patch-ext_cairo_gsttimeoverlay.h deleted file mode 100644 index 1c2c4e70f..000000000 --- a/multimedia/gstreamer-plugins/files/patch-ext_cairo_gsttimeoverlay.h +++ /dev/null @@ -1,30 +0,0 @@ ---- ext/cairo/gsttimeoverlay.h.orig Sun Jun 12 10:43:50 2005 -+++ ext/cairo/gsttimeoverlay.h Sun Jun 12 10:44:04 2005 -@@ -31,7 +31,7 @@ - G_BEGIN_DECLS - - #define GST_TYPE_TIMEOVERLAY \ -- (gst_timeoverlay_get_type()) -+ (gst_cairotimeoverlay_get_type()) - #define GST_TIMEOVERLAY(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_TIMEOVERLAY,GstTimeoverlay)) - #define GST_TIMEOVERLAY_CLASS(klass) \ -@@ -46,17 +46,14 @@ - - struct _GstTimeoverlay { - GstVideofilter videofilter; -- -- cairo_t *cr; - int text_height; -- - }; - - struct _GstTimeoverlayClass { - GstVideofilterClass parent_class; - }; - --GType gst_timeoverlay_get_type(void); -+GType gst_cairotimeoverlay_get_type(void); - - G_END_DECLS - diff --git a/multimedia/gstreamer-plugins/files/patch-ext_cdparanoia_gstcdparanoia.c b/multimedia/gstreamer-plugins/files/patch-ext_cdparanoia_gstcdparanoia.c deleted file mode 100644 index 17e8469ad..000000000 --- a/multimedia/gstreamer-plugins/files/patch-ext_cdparanoia_gstcdparanoia.c +++ /dev/null @@ -1,18 +0,0 @@ ---- ext/cdparanoia/gstcdparanoia.c.orig Fri Jun 3 06:59:43 2005 -+++ ext/cdparanoia/gstcdparanoia.c Fri Jun 3 07:00:13 2005 -@@ -561,6 +561,7 @@ - gint16 *cdda_buf; - gint64 timestamp; - GstFormat format; -+ GstEvent *discont_ev; - - /* convert the sequence sector number to a timestamp */ - format = GST_FORMAT_TIME; -@@ -574,7 +575,6 @@ - gst_pad_convert (src->srcpad, sector_format, - get_relative (src, src->cur_track, src->cur_sector), &format, - ×tamp); -- GstEvent *discont_ev; - - if (src->flush_pending) { - src->flush_pending = FALSE; diff --git a/multimedia/gstreamer-plugins/files/patch-ext_libcaca_Makefile.in b/multimedia/gstreamer-plugins/files/patch-ext_libcaca_Makefile.in deleted file mode 100644 index 0ee53a92e..000000000 --- a/multimedia/gstreamer-plugins/files/patch-ext_libcaca_Makefile.in +++ /dev/null @@ -1,23 +0,0 @@ ---- ext/libcaca/Makefile.in.orig Mon Oct 4 00:07:18 2004 -+++ ext/libcaca/Makefile.in Mon Oct 4 00:07:59 2004 -@@ -76,8 +76,7 @@ - pluginLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(plugin_LTLIBRARIES) - am__DEPENDENCIES_1 = --libgstcacasink_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -- $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la -+libgstcacasink_la_DEPENDENCIES = $(am__DEPENDENCIES_1) - am_libgstcacasink_la_OBJECTS = libgstcacasink_la-gstcacasink.lo - libgstcacasink_la_OBJECTS = $(am_libgstcacasink_la_OBJECTS) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -616,9 +615,7 @@ - plugin_LTLIBRARIES = libgstcacasink.la - libgstcacasink_la_SOURCES = gstcacasink.c - libgstcacasink_la_CFLAGS = $(GST_CFLAGS) $(LIBCACA_CFLAGS) --libgstcacasink_la_LIBADD = $(LIBCACA_LIBS) \ -- $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la -- -+libgstcacasink_la_LIBADD = $(LIBCACA_LIBS) -lgstinterfaces-%%VERSION%% - libgstcacasink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) - noinst_HEADERS = gstcacasink.h - all: all-am diff --git a/multimedia/gstreamer-plugins/files/patch-ext_mpeg2enc_gstmpeg2encoptions.cc b/multimedia/gstreamer-plugins/files/patch-ext_mpeg2enc_gstmpeg2encoptions.cc deleted file mode 100644 index aabbc2971..000000000 --- a/multimedia/gstreamer-plugins/files/patch-ext_mpeg2enc_gstmpeg2encoptions.cc +++ /dev/null @@ -1,26 +0,0 @@ ---- ext/mpeg2enc/gstmpeg2encoptions.cc.orig Mon Jul 5 19:54:18 2004 -+++ ext/mpeg2enc/gstmpeg2encoptions.cc Mon Jul 5 20:05:37 2004 -@@ -267,11 +267,23 @@ - * Class init stuff. - */ - -+#if !defined(_SC_NPROCESSORS_ONLN) && defined(__FreeBSD__) -+#include <sys/types.h> -+#include <sys/sysctl.h> -+#endif -+ - GstMpeg2EncOptions::GstMpeg2EncOptions (): - MPEG2EncOptions () - { - /* autodetect number of CPUs */ -+#if !defined(_SC_NPROCESSORS_ONLN) && defined(__FreeBSD__) -+ /* We need to use a sysctl to get the number of CPUs. */ -+ size_t len = sizeof (num_cpus); -+ -+ sysctlbyname ("hw.ncpu", &num_cpus, &len, NULL, 0); -+#else - num_cpus = sysconf (_SC_NPROCESSORS_ONLN); -+#endif - if (num_cpus < 0) - num_cpus = 1; - if (num_cpus > 32) diff --git a/multimedia/gstreamer-plugins/files/patch-ext_sdl_Makefile.in b/multimedia/gstreamer-plugins/files/patch-ext_sdl_Makefile.in deleted file mode 100644 index c943042ad..000000000 --- a/multimedia/gstreamer-plugins/files/patch-ext_sdl_Makefile.in +++ /dev/null @@ -1,23 +0,0 @@ ---- ext/sdl/Makefile.in.orig Mon Oct 4 00:56:57 2004 -+++ ext/sdl/Makefile.in Mon Oct 4 00:57:47 2004 -@@ -76,8 +76,7 @@ - pluginLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(plugin_LTLIBRARIES) - am__DEPENDENCIES_1 = --libgstsdlvideosink_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -- $(top_builddir)/gst-libs/gst/libgstinterfaces-@GST_MAJORMINOR@.la -+libgstsdlvideosink_la_DEPENDENCIES = $(am__DEPENDENCIES_1) - am_libgstsdlvideosink_la_OBJECTS = \ - libgstsdlvideosink_la-sdlvideosink.lo - libgstsdlvideosink_la_OBJECTS = $(am_libgstsdlvideosink_la_OBJECTS) -@@ -617,9 +616,7 @@ - plugin_LTLIBRARIES = libgstsdlvideosink.la - libgstsdlvideosink_la_SOURCES = sdlvideosink.c - libgstsdlvideosink_la_CFLAGS = $(GST_CFLAGS) $(SDL_CFLAGS) --libgstsdlvideosink_la_LIBADD = $(SDL_LIBS) \ -- $(top_builddir)/gst-libs/gst/libgstinterfaces-@GST_MAJORMINOR@.la -- -+libgstsdlvideosink_la_LIBADD = $(SDL_LIBS) -lgstinterfaces-%%VERSION%% - libgstsdlvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) - noinst_HEADERS = sdlvideosink.h - all: all-am diff --git a/multimedia/gstreamer-plugins/files/patch-gst_ffmpegcolorspace_Makefile.in b/multimedia/gstreamer-plugins/files/patch-gst_ffmpegcolorspace_Makefile.in deleted file mode 100644 index fb2afdfb0..000000000 --- a/multimedia/gstreamer-plugins/files/patch-gst_ffmpegcolorspace_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- gst/ffmpegcolorspace/Makefile.in.orig Wed Mar 9 01:40:27 2005 -+++ gst/ffmpegcolorspace/Makefile.in Wed Mar 9 01:41:10 2005 -@@ -360,7 +360,7 @@ - LAME_LIBS = @LAME_LIBS@ - LCS_CFLAGS = @LCS_CFLAGS@ - LCS_LIBS = @LCS_LIBS@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ -Wl,-Bsymbolic -lc - LIBCACA_CFLAGS = @LIBCACA_CFLAGS@ - LIBCACA_CONFIG = @LIBCACA_CONFIG@ - LIBCACA_LIBS = @LIBCACA_LIBS@ diff --git a/multimedia/gstreamer-plugins/files/patch-gst_librfb_gstrfbsrc.c b/multimedia/gstreamer-plugins/files/patch-gst_librfb_gstrfbsrc.c deleted file mode 100644 index e83f13650..000000000 --- a/multimedia/gstreamer-plugins/files/patch-gst_librfb_gstrfbsrc.c +++ /dev/null @@ -1,10 +0,0 @@ ---- gst/librfb/gstrfbsrc.c.orig Fri Jun 3 06:06:43 2005 -+++ gst/librfb/gstrfbsrc.c Fri Jun 3 06:08:21 2005 -@@ -28,6 +28,7 @@ - #include <string.h> - #include <stdlib.h> - #include <unistd.h> -+#include <sys/time.h> - - #include <librfb/rfb.h> - diff --git a/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h b/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h deleted file mode 100644 index daaefac5e..000000000 --- a/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h +++ /dev/null @@ -1,72 +0,0 @@ ---- sys/cdrom/gstcdplayer_ioctl_bsd.h.orig Mon Mar 1 06:52:03 2004 -+++ sys/cdrom/gstcdplayer_ioctl_bsd.h Tue Mar 9 16:05:36 2004 -@@ -142,6 +142,7 @@ - { - struct ioc_toc_header toc_header; - struct ioc_read_toc_entry toc_entry; -+ struct cd_toc_entry toc_entry_data; - guint i; - - cd->fd = open(device,O_RDONLY | O_NONBLOCK); -@@ -151,7 +152,7 @@ - } - - /* get the toc header information */ -- if (ioctl(cd->fd,CDIOREADTOCHDR,&toc_header) != 0) { -+ if (ioctl(cd->fd,CDIOREADTOCHEADER,&toc_header) != 0) { - close(cd->fd); - cd->fd = -1; - return FALSE; -@@ -161,6 +162,8 @@ - for (i = 1; i <= toc_header.ending_track; i++) { - toc_entry.address_format = CD_MSF_FORMAT; - toc_entry.starting_track = i; -+ toc_entry.data = &toc_entry_data; -+ toc_entry.data_len = sizeof(toc_entry_data); - - if (ioctl(cd->fd,CDIOREADTOCENTRYS,&toc_entry) != 0) { - close(cd->fd); -@@ -168,9 +171,9 @@ - return FALSE; - } - -- cd->tracks[i].minute = toc_entry.entry.addr.msf.minute; -- cd->tracks[i].second = toc_entry.entry.addr.msf.second; -- cd->tracks[i].frame = toc_entry.entry.addr.msf.frame; -+ cd->tracks[i].minute = toc_entry.data->addr.msf.minute; -+ cd->tracks[i].second = toc_entry.data->addr.msf.second; -+ cd->tracks[i].frame = toc_entry.data->addr.msf.frame; - cd->tracks[i].data_track = (toc_entry.data->control & 4) == 4; - } - -@@ -186,9 +189,9 @@ - return FALSE; - } - -- cd->tracks[LEADOUT].minute = toc_entry.entry.addr.msf.minute; -- cd->tracks[LEADOUT].second = toc_entry.entry.addr.msf.second; -- cd->tracks[LEADOUT].frame = toc_entry.entry.addr.msf.frame; -+ cd->tracks[LEADOUT].minute = toc_entry.data->addr.msf.minute; -+ cd->tracks[LEADOUT].second = toc_entry.data->addr.msf.second; -+ cd->tracks[LEADOUT].frame = toc_entry.data->addr.msf.frame; - - cd->num_tracks = toc_header.ending_track; - -@@ -224,6 +227,8 @@ - return FALSE; - } - -+ /* lets return TRUE and lets see what happes (may not be correct)*/ -+ return TRUE; - } - - gboolean cd_pause(struct cd *cd) -@@ -321,7 +326,7 @@ - return -1; - } - --#ifdef __NetBSD__ -+#if defined(__NetBSD__) || defined(__FreeBSD__) - return sub_channel.data->what.track_info.track_number; - #else - return sub_channel.data->track_number; diff --git a/multimedia/gstreamer-plugins/files/patch-sys_oss_gstosselement.h b/multimedia/gstreamer-plugins/files/patch-sys_oss_gstosselement.h deleted file mode 100644 index 30258ba11..000000000 --- a/multimedia/gstreamer-plugins/files/patch-sys_oss_gstosselement.h +++ /dev/null @@ -1,10 +0,0 @@ ---- sys/oss/gstosselement.h.orig Tue Mar 9 16:46:05 2004 -+++ sys/oss/gstosselement.h Tue Mar 9 16:46:14 2004 -@@ -23,6 +23,7 @@ - #ifndef __GST_OSS_ELEMENT_H__ - #define __GST_OSS_ELEMENT_H__ - -+#include <sys/types.h> - #include <gst/gst.h> - - /* debugging category */ |