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

Security update to 1.1.16.3 from Brad (maintainer) - int overflows in

Browse Source 
the 4XM demux (TKADV2009-004, CVE-2009-0385) and the Quicktime demux.
This commit is contained in:
sthen 2009-04-04 00:28:56 +00:00
parent 15e45e6941
commit cea15ea335
20 changed files with 71 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
multimedia/xine-lib/Makefile
View File

@ -1,17 +1,16 @@
# $OpenBSD: Makefile,v 1.51 2009/02/21 21:48:10 kili Exp $
# $OpenBSD: Makefile,v 1.52 2009/04/04 00:28:56 sthen Exp $
SHARED_ONLY= Yes
COMMENT= multimedia decoding library
V= 1.1.16.2
V= 1.1.16.3
DISTNAME= xine-lib-${V}
PKGNAME= ${DISTNAME}p1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
EXTRACT_SUFX= .tar.bz2
SHARED_LIBS= xine 24.0
SHARED_LIBS= xine 25.0
HOMEPAGE= http://www.xine-project.org/
@ -26,7 +25,7 @@ WANTLIB= X11 Xau Xdmcp Xext Xinerama Xrandr Xrender Xv XvMCW c \
expat fontconfig freetype jpeg lcms m pthread sndio \
usbhid z
XINEAPI_REV= 1.25
XINEAPI_REV= 1.26
SUBST_VARS+= XINEAPI_REV
MODULES= devel/gettext
@ -96,6 +95,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
EXTRA_X_LIBS="-Wl,-R,${LOCALBASE}/lib -Wl,-R,${X11BASE}/lib" \
ac_cv_member_audio_info_t_output_muted=yes
NO_REGRESS= Yes
post-extract:
@cp ${FILESDIR}/audio_sndio_out.c ${WRKSRC}/src/audio_out
.if ${MACHINE_ARCH} == "i386"

10
multimedia/xine-lib/distinfo
View File

@ -1,5 +1,5 @@
MD5 (xine-lib-1.1.16.2.tar.bz2) = M23R9iZun5Q0MMpgCbeqfg==
RMD160 (xine-lib-1.1.16.2.tar.bz2) = gNpr8hJ7w0nbvJ2g9VKYaREGeLQ=
SHA1 (xine-lib-1.1.16.2.tar.bz2) = +qPZIH2RGlNRYaPNVmCqnmuQTCg=
SHA256 (xine-lib-1.1.16.2.tar.bz2) = Z/JGn67pZLdfQ0WVR7Xi+aQHuNwwy+/6mJzOMS4WssE=
SIZE (xine-lib-1.1.16.2.tar.bz2) = 7407399
MD5 (xine-lib-1.1.16.3.tar.bz2) = T1CKvwiM9CenMfhWNMgmDQ==
RMD160 (xine-lib-1.1.16.3.tar.bz2) = J5MEpOmYRysrXnmIflTEd2UETsY=
SHA1 (xine-lib-1.1.16.3.tar.bz2) = ZMV8X1X/NwI8xMPZPU3zwGlQ0jU=
SHA256 (xine-lib-1.1.16.3.tar.bz2) = 0lokHvpV3H2PSCM276i7e5u51ptt+KijfyZglI/We1I=
SIZE (xine-lib-1.1.16.3.tar.bz2) = 7468182

25
multimedia/xine-lib/patches/patch-configure_ac
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.3 2009/02/16 01:24:24 sthen Exp $
--- configure.ac.orig Tue Feb 10 13:32:37 2009
+++ configure.ac Wed Feb 11 00:55:39 2009
$OpenBSD: patch-configure_ac,v 1.4 2009/04/04 00:28:56 sthen Exp $
--- configure.ac.orig Thu Apr 2 14:44:45 2009
+++ configure.ac Fri Apr 3 14:42:42 2009
@@ -212,6 +212,10 @@ AC_PROG_GMSGFMT_PLURAL
AC_CHECK_FUNCS([nl_langinfo])
@ -12,7 +12,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/02/16 01:24:24 sthen Exp $
dnl ---------------------------------------------
dnl Checks for typedefs, structures, and compiler characteristics.
dnl ---------------------------------------------
@@ -545,9 +549,9 @@ t q
@@ -553,9 +557,9 @@ t q
b
:q
q"
@ -24,7 +24,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/02/16 01:24:24 sthen Exp $
AC_DEFINE_UNQUOTED([LIBXV_SO], "${x_lib_location:-libXv.so}", [The soname of libXv, needed for dlopen()])
@@ -1267,7 +1271,7 @@ if test "x$enable_a52dec" = "xno"; then
@@ -1275,7 +1279,7 @@ if test "x$enable_a52dec" = "xno"; then
AC_MSG_RESULT([a52dec support disabled])
elif test "x$external_a52dec" = "xyes"; then
have_a52="yes"
@ -33,7 +33,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/02/16 01:24:24 sthen Exp $
[
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
@@ -1358,9 +1362,10 @@ if test "x$with_mng" = "xyes"; then
@@ -1366,9 +1370,10 @@ if test "x$with_mng" = "xyes"; then
AC_CHECK_LIB(mng, mng_initialize,
[ AC_CHECK_HEADER(libmng.h,
[ have_libmng=yes
@ -46,7 +46,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/02/16 01:24:24 sthen Exp $
AC_SUBST(MNG_LIBS)
else
have_libmng=no
@@ -1556,6 +1561,28 @@ AM_CONDITIONAL([HAVE_JACK], [test "x$have_jack" = "xye
@@ -1564,6 +1569,28 @@ AM_CONDITIONAL([HAVE_JACK], [test "x$have_jack" = "xye
dnl ---------------------------------------------
@ -75,16 +75,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/02/16 01:24:24 sthen Exp $
dnl gnome-vfs support
dnl ---------------------------------------------
@@ -2504,7 +2531,7 @@ dnl ---------------------------------------------
XINE_BUILD_CC="`$CC -v 2>&1 | tail -1 2>/dev/null`"
XINE_BUILD_OS="`uname -s -r -m`"
-XINE_BUILD_DATE="`date \"+%a %d %b %Y %T\"`"
+XINE_BUILD_DATE="`date "+%a %d %b %Y %T"`"
AC_SUBST(XINE_BUILD_CC)
AC_SUBST(XINE_BUILD_OS)
AC_SUBST(XINE_BUILD_DATE)
@@ -3159,6 +3186,9 @@ if test "x$have_pulseaudio" = "xyes"; then
@@ -3170,6 +3197,9 @@ if test "x$have_pulseaudio" = "xyes"; then
fi
if test "x$have_jack" = "xyes"; then
echo " - Jack"

12
multimedia/xine-lib/patches/patch-m4_attributes_m4
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-m4_attributes_m4,v 1.1 2009/02/02 22:00:42 sthen Exp $
--- m4/attributes.m4.orig Thu Jan 8 01:12:43 2009
+++ m4/attributes.m4 Thu Jan 8 01:13:31 2009
@@ -109,7 +109,7 @@ AC_DEFUN([CC_NOUNDEFINED], [
dnl FreeBSD (et al.) does not complete linking for shared objects when pthreads
dnl are requested, as different implementations are present; to avoid problems
dnl use -Wl,-z,defs only for those platform not behaving this way.
- *-freebsd*) ;;
+ *-freebsd* | *-openbsd*) ;;
*)
dnl First of all check for the --no-undefined variant of GNU ld. This allows
dnl for a much more readable commandline, so that people can understand what

18
multimedia/xine-lib/patches/patch-src_audio_out_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_audio_out_Makefile_in,v 1.14 2009/02/16 01:24:24 sthen Exp $
--- src/audio_out/Makefile.in.orig Tue Feb 10 13:34:49 2009
+++ src/audio_out/Makefile.in Wed Feb 11 00:55:39 2009
$OpenBSD: patch-src_audio_out_Makefile_in,v 1.15 2009/04/04 00:28:56 sthen Exp $
--- src/audio_out/Makefile.in.orig Thu Apr 2 14:45:51 2009
+++ src/audio_out/Makefile.in Fri Apr 3 14:42:42 2009
@@ -174,6 +174,18 @@ xineplug_ao_out_jack_la_LINK = $(LIBTOOL) --tag=CC $(A
$(xineplug_ao_out_jack_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_JACK_TRUE@am_xineplug_ao_out_jack_la_rpath = -rpath \
@ -45,7 +45,7 @@ $OpenBSD: patch-src_audio_out_Makefile_in,v 1.14 2009/02/16 01:24:24 sthen Exp $
KSTAT_LIBS = @KSTAT_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
@@ -587,6 +603,7 @@ EXTRA_DIST = audio_irixal_out.c
@@ -588,6 +604,7 @@ EXTRA_DIST = audio_irixal_out.c
@HAVE_PULSEAUDIO_TRUE@pulseaudio_module = xineplug_ao_out_pulseaudio.la
@HAVE_FUSIONSOUND_TRUE@fusionsound_module = xineplug_ao_out_fusionsound.la
@HAVE_JACK_TRUE@jack_module = xineplug_ao_out_jack.la
@ -53,7 +53,7 @@ $OpenBSD: patch-src_audio_out_Makefile_in,v 1.14 2009/02/16 01:24:24 sthen Exp $
# IMPORTANT:
# ---------
@@ -604,7 +621,8 @@ xineplug_LTLIBRARIES = xineplug_ao_out_none.la xineplu
@@ -605,7 +622,8 @@ xineplug_LTLIBRARIES = xineplug_ao_out_none.la xineplu
$(pulseaudio_module) \
$(directx2_module) \
$(fusionsound_module) \
@ -63,7 +63,7 @@ $OpenBSD: patch-src_audio_out_Makefile_in,v 1.14 2009/02/16 01:24:24 sthen Exp $
xineplug_ao_out_none_la_SOURCES = audio_none_out.c
xineplug_ao_out_none_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
@@ -671,6 +689,10 @@ xineplug_ao_out_jack_la_SOURCES = audio_jack_out.c
@@ -672,6 +690,10 @@ xineplug_ao_out_jack_la_SOURCES = audio_jack_out.c
xineplug_ao_out_jack_la_LIBADD = $(XINE_LIB) $(JACK_LIBS) $(LTLIBINTL)
xineplug_ao_out_jack_la_CFLAGS = $(VISIBILITY_FLAG) $(JACK_CFLAGS)
xineplug_ao_out_jack_la_LDFLAGS = -avoid-version -module
@ -74,7 +74,7 @@ $OpenBSD: patch-src_audio_out_Makefile_in,v 1.14 2009/02/16 01:24:24 sthen Exp $
all: all-am
.SUFFIXES:
@@ -749,6 +771,8 @@ xineplug_ao_out_fusionsound.la: $(xineplug_ao_out_fusi
@@ -750,6 +772,8 @@ xineplug_ao_out_fusionsound.la: $(xineplug_ao_out_fusi
$(xineplug_ao_out_fusionsound_la_LINK) $(am_xineplug_ao_out_fusionsound_la_rpath) $(xineplug_ao_out_fusionsound_la_OBJECTS) $(xineplug_ao_out_fusionsound_la_LIBADD) $(LIBS)
xineplug_ao_out_jack.la: $(xineplug_ao_out_jack_la_OBJECTS) $(xineplug_ao_out_jack_la_DEPENDENCIES)
$(xineplug_ao_out_jack_la_LINK) $(am_xineplug_ao_out_jack_la_rpath) $(xineplug_ao_out_jack_la_OBJECTS) $(xineplug_ao_out_jack_la_LIBADD) $(LIBS)
@ -83,7 +83,7 @@ $OpenBSD: patch-src_audio_out_Makefile_in,v 1.14 2009/02/16 01:24:24 sthen Exp $
xineplug_ao_out_none.la: $(xineplug_ao_out_none_la_OBJECTS) $(xineplug_ao_out_none_la_DEPENDENCIES)
$(xineplug_ao_out_none_la_LINK) -rpath $(xineplugdir) $(xineplug_ao_out_none_la_OBJECTS) $(xineplug_ao_out_none_la_LIBADD) $(LIBS)
xineplug_ao_out_oss.la: $(xineplug_ao_out_oss_la_OBJECTS) $(xineplug_ao_out_oss_la_DEPENDENCIES)
@@ -773,6 +797,7 @@ distclean-compile:
@@ -774,6 +798,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_ao_out_file_la-audio_file_out.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_ao_out_fusionsound_la-audio_fusionsound_out.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_ao_out_jack_la-audio_jack_out.Plo@am__quote@
@ -91,7 +91,7 @@ $OpenBSD: patch-src_audio_out_Makefile_in,v 1.14 2009/02/16 01:24:24 sthen Exp $
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_ao_out_none_la-audio_none_out.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_ao_out_oss_la-audio_oss_out.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_ao_out_pulseaudio_la-audio_pulse_out.Plo@am__quote@
@@ -861,6 +886,13 @@ xineplug_ao_out_jack_la-audio_jack_out.lo: audio_jack_
@@ -862,6 +887,13 @@ xineplug_ao_out_jack_la-audio_jack_out.lo: audio_jack_
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='audio_jack_out.c' object='xineplug_ao_out_jack_la-audio_jack_out.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xineplug_ao_out_jack_la_CFLAGS) $(CFLAGS) -c -o xineplug_ao_out_jack_la-audio_jack_out.lo `test -f 'audio_jack_out.c' || echo '$(srcdir)/'`audio_jack_out.c

13
multimedia/xine-lib/patches/patch-src_combined_ffmpeg_Makefile_in
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_combined_ffmpeg_Makefile_in,v 1.1 2009/02/16 01:24:24 sthen Exp $
--- src/combined/ffmpeg/Makefile.in.orig Tue Feb 10 13:34:50 2009
+++ src/combined/ffmpeg/Makefile.in Fri Feb 13 12:44:19 2009
@@ -889,8 +889,7 @@ avcodec_video.list: AV_CODECS:=/CODEC_ID_MPEG1VIDEO/,/
avcodec_audio.list avcodec_video.list:
echo '#include "$(srcdir)/ffmpeg_decoder.h"' | $(AV_CPP) - |\
- sed -e $(AV_CODECS)'! d; s/^\s*//; s/[=,].*//; /^$$/ d' |\
- head -n -1 >$@
+ sed -e $(AV_CODECS)'! d; s/^[ \t]*//; s/[=,].*//; /^$$/ d' >$@
# Generate the mappings. These are #included where needed.
ff_%_list.h: $(srcdir)/mkcodeclist.pl avcodec_%.list $(srcdir)/xine_%.list

8
multimedia/xine-lib/patches/patch-src_demuxers_demux_qt_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_demuxers_demux_qt_c,v 1.7 2009/02/02 22:00:42 sthen Exp $
--- src/demuxers/demux_qt.c.orig Wed Jan 7 11:14:32 2009
+++ src/demuxers/demux_qt.c Thu Jan 8 01:02:34 2009
@@ -3049,7 +3049,7 @@ static demux_plugin_t *open_plugin (demux_class_t *cla
$OpenBSD: patch-src_demuxers_demux_qt_c,v 1.8 2009/04/04 00:28:56 sthen Exp $
--- src/demuxers/demux_qt.c.orig Thu Apr 2 14:44:44 2009
+++ src/demuxers/demux_qt.c Fri Apr 3 14:42:42 2009
@@ -3055,7 +3055,7 @@ static demux_plugin_t *open_plugin (demux_class_t *cla
/* special consideration for DRM-protected files */
if (this->qt->last_error == QT_DRM_NOT_SUPPORTED)
_x_message (this->stream, XINE_MSG_ENCRYPTED_SOURCE,

8
multimedia/xine-lib/patches/patch-src_input_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_input_Makefile_in,v 1.14 2009/02/16 01:24:24 sthen Exp $
--- src/input/Makefile.in.orig Tue Feb 10 13:34:51 2009
+++ src/input/Makefile.in Wed Feb 11 00:55:39 2009
@@ -598,7 +598,7 @@ EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c
$OpenBSD: patch-src_input_Makefile_in,v 1.15 2009/04/04 00:28:56 sthen Exp $
--- src/input/Makefile.in.orig Thu Apr 2 14:45:53 2009
+++ src/input/Makefile.in Fri Apr 3 14:42:42 2009
@@ -599,7 +599,7 @@ EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c
# ---------
# All of xine input plugins should be named like the scheme "xineplug_inp_"
#

75
multimedia/xine-lib/patches/patch-src_input_input_cdda_c
View File

@ -1,75 +0,0 @@
$OpenBSD: patch-src_input_input_cdda_c,v 1.7 2009/02/02 22:00:42 sthen Exp $
--- src/input/input_cdda.c.orig Sun Jan 4 10:47:28 2009
+++ src/input/input_cdda.c Thu Jan 8 01:02:34 2009
@@ -72,7 +72,7 @@
#elif defined(WIN32)
#define DEFAULT_CDDA_DEVICE "d:\\"
#else
-#define DEFAULT_CDDA_DEVICE "/dev/cdrom"
+#define DEFAULT_CDDA_DEVICE "/dev/rcd0c"
#endif
#define CDDB_SERVER "freedb.freedb.org"
@@ -611,7 +611,7 @@ static int read_cdrom_frames(cdda_input_plugin_t *this
return 0;
}
-#elif defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+#elif defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__)
#include <sys/cdio.h>
@@ -624,7 +624,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
struct ioc_toc_header tochdr;
#if defined(__FreeBSD_kernel__)
struct ioc_read_toc_single_entry tocentry;
-#elif defined(__NetBSD__)
+#elif defined(__NetBSD__) || defined(__OpenBSD__)
struct ioc_read_toc_entry tocentry;
struct cd_toc_entry data;
#endif
@@ -659,7 +659,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
perror("CDIOREADTOCENTRY");
return -1;
}
-#elif defined(__NetBSD__)
+#elif defined(__NetBSD__) || defined(__OpenBSD__)
memset(&data, 0, sizeof(data));
tocentry.data_len = sizeof(data);
tocentry.data = &data;
@@ -680,7 +680,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
(tocentry.entry.addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) +
(tocentry.entry.addr.msf.second * CD_FRAMES_PER_SECOND) +
tocentry.entry.addr.msf.frame;
-#elif defined(__NetBSD__)
+#elif defined(__NetBSD__) || defined(__OpenBSD__)
toc->toc_entries[i-1].track_mode = (tocentry.data->control & 0x04) ? 1 : 0;
toc->toc_entries[i-1].first_frame_minute = tocentry.data->addr.msf.minute;
toc->toc_entries[i-1].first_frame_second = tocentry.data->addr.msf.second;
@@ -702,7 +702,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
perror("CDIOREADTOCENTRY");
return -1;
}
-#elif defined(__NetBSD__)
+#elif defined(__NetBSD__) || defined(__OpenBSD__)
memset(&data, 0, sizeof(data));
tocentry.data_len = sizeof(data);
tocentry.data = &data;
@@ -723,7 +723,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
(tocentry.entry.addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) +
(tocentry.entry.addr.msf.second * CD_FRAMES_PER_SECOND) +
tocentry.entry.addr.msf.frame;
-#elif defined(__NetBSD__)
+#elif defined(__NetBSD__) || defined(__OpenBSD__)
toc->leadout_track.track_mode = (tocentry.data->control & 0x04) ? 1 : 0;
toc->leadout_track.first_frame_minute = tocentry.data->addr.msf.minute;
toc->leadout_track.first_frame_second = tocentry.data->addr.msf.second;
@@ -761,7 +761,7 @@ static int read_cdrom_frames(cdda_input_plugin_t *this
perror("CDIOCREADAUDIO");
return -1;
}
-#elif defined(__NetBSD__)
+#elif defined(__NetBSD__) || defined(__OpenBSD__)
scsireq_t req;
int nblocks = 1;

21
multimedia/xine-lib/patches/patch-src_input_input_dvd_c
View File

@ -1,18 +1,7 @@
$OpenBSD: patch-src_input_input_dvd_c,v 1.6 2009/02/02 22:00:42 sthen Exp $
--- src/input/input_dvd.c.orig Wed Jan 7 11:14:32 2009
+++ src/input/input_dvd.c Thu Jan 8 01:02:34 2009
@@ -116,8 +116,8 @@
#define DVD_PATH "d:\\"
#define RDVD_PATH "d:\\"
#else
-#define DVD_PATH "/dev/dvd"
-#define RDVD_PATH "/dev/rdvd"
+#define DVD_PATH "/dev/rcd0c"
+#define RDVD_PATH "/dev/rcd0c"
#endif
/* Some misc. defines */
@@ -603,7 +603,7 @@ static buf_element_t *dvd_plugin_read_block (input_plu
$OpenBSD: patch-src_input_input_dvd_c,v 1.7 2009/04/04 00:28:56 sthen Exp $
--- src/input/input_dvd.c.orig Wed Feb 18 06:37:42 2009
+++ src/input/input_dvd.c Fri Apr 3 14:42:42 2009
@@ -606,7 +606,7 @@ static buf_element_t *dvd_plugin_read_block (input_plu
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
_("input_dvd: Error getting next block from DVD (%s)\n"), dvdnav_err_to_string(this->dvdnav));
_x_message(this->stream, XINE_MSG_READ_ERROR,
@ -21,7 +10,7 @@ $OpenBSD: patch-src_input_input_dvd_c,v 1.6 2009/02/02 22:00:42 sthen Exp $
if (block != buf->mem) dvdnav_free_cache_block(this->dvdnav, block);
buf->free_buffer(buf);
return NULL;
@@ -1494,7 +1494,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen)
@@ -1497,7 +1497,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen)
xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("input_dvd: Error opening DVD device\n"));
_x_message(this->stream, XINE_MSG_READ_ERROR,
/* FIXME: see FIXME in dvd_parse_try_open() */

77
multimedia/xine-lib/patches/patch-src_input_input_vcd_c
View File

@ -1,77 +0,0 @@
$OpenBSD: patch-src_input_input_vcd_c,v 1.5 2008/01/15 00:36:46 jakemsr Exp $
--- src/input/input_vcd.c.orig Tue Jan 1 08:30:08 2008
+++ src/input/input_vcd.c Wed Jan 9 02:04:58 2008
@@ -92,7 +92,7 @@ typedef struct {
#if defined (__linux__) || defined(__sun)
struct cdrom_tochdr tochdr;
struct cdrom_tocentry tocent[100];
-#elif defined (__FreeBSD_kernel__)
+#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__)
struct ioc_toc_header tochdr;
struct cd_toc_entry *tocent;
off_t cur_sec;
@@ -117,7 +117,7 @@ typedef struct {
int cur_track;
-#if defined (__linux__) || defined(__sun) || defined (__FreeBSD_kernel__)
+#if defined (__linux__) || defined(__sun) || defined (__FreeBSD_kernel__) || defined (__OpenBSD__)
uint8_t cur_min, cur_sec, cur_frame;
#endif
@@ -177,7 +177,7 @@ static int input_vcd_read_toc (vcd_input_class_t *this
return 0;
}
-#elif defined (__FreeBSD_kernel__)
+#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__)
static int input_vcd_read_toc (vcd_input_class_t *this, int fd) {
struct ioc_read_toc_entry te;
@@ -393,7 +393,7 @@ static off_t vcd_plugin_read (input_plugin_t *this_gen
memcpy (buf, data.data, VCDSECTORSIZE); /* FIXME */
return VCDSECTORSIZE;
}
-#elif defined (__FreeBSD_kernel__)
+#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__)
static off_t vcd_plugin_read (input_plugin_t *this_gen,
char *buf, off_t nlen) {
vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen;
@@ -531,7 +531,7 @@ static buf_element_t *vcd_plugin_read_block (input_plu
memcpy (buf->mem, data.data, VCDSECTORSIZE); /* FIXME */
return buf;
}
-#elif defined (__FreeBSD_kernel__)
+#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__)
static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen,
fifo_buffer_t *fifo, off_t nlen) {
@@ -690,7 +690,7 @@ static off_t vcd_plugin_seek (input_plugin_t *this_gen
return offset ; /* FIXME */
}
-#elif defined (__FreeBSD_kernel__)
+#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__)
static off_t vcd_plugin_seek (input_plugin_t *this_gen,
off_t offset, int origin) {
@@ -764,7 +764,7 @@ static off_t vcd_plugin_get_length (input_plugin_t *th
return (off_t) 0;
}
-#elif defined (__FreeBSD_kernel__)
+#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__)
static off_t vcd_plugin_get_length (input_plugin_t *this_gen) {
vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen;
off_t len ;
@@ -859,6 +859,10 @@ static int vcd_plugin_open (input_plugin_t *this_gen)
this->cur_min = this->cls->tocent[this->cur_track].cdte_addr.msf.minute;
this->cur_sec = this->cls->tocent[this->cur_track].cdte_addr.msf.second;
this->cur_frame = this->cls->tocent[this->cur_track].cdte_addr.msf.frame;
+#elif defined (__OpenBSD__)
+ this->cur_min = this->cls->tocent[this->cur_track + 1 - this->cls->tochdr.starting_track].addr.msf.minute;
+ this->cur_sec = this->cls->tocent[this->cur_track + 1 - this->cls->tochdr.starting_track].addr.msf.second;
+ this->cur_frame = this->cls->tocent[this->cur_track + 1 - this->cls->tochdr.starting_track].addr.msf.frame;
#elif defined (__FreeBSD_kernel__)
{
int bsize = 2352;

10
multimedia/xine-lib/patches/patch-src_libw32dll_wine_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.13 2009/02/16 01:24:24 sthen Exp $
--- src/libw32dll/wine/Makefile.in.orig Tue Feb 10 13:34:58 2009
+++ src/libw32dll/wine/Makefile.in Wed Feb 11 00:55:39 2009
$OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.14 2009/04/04 00:28:56 sthen Exp $
--- src/libw32dll/wine/Makefile.in.orig Thu Apr 2 14:46:00 2009
+++ src/libw32dll/wine/Makefile.in Fri Apr 3 14:42:43 2009
@@ -64,7 +64,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
libwine_la_LIBADD =
am_libwine_la_OBJECTS = afl.lo driver.lo elfdll.lo ext.lo \
@ -10,7 +10,7 @@ $OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.13 2009/02/16 01:24:24 sthen
libwine_la_OBJECTS = $(am_libwine_la_OBJECTS)
@HAVE_W32DLL_TRUE@am_libwine_la_rpath =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
@@ -432,6 +432,7 @@ libwine_la_SOURCES = \
@@ -433,6 +433,7 @@ libwine_la_SOURCES = \
registry.c \
vfl.c \
win32.c \
@ -18,7 +18,7 @@ $OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.13 2009/02/16 01:24:24 sthen
stubs.s \
wrapper.S
@@ -537,6 +538,7 @@ distclean-compile:
@@ -538,6 +539,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapper.Plo@am__quote@

12
multimedia/xine-lib/patches/patch-src_libw32dll_wine_pe_image_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_libw32dll_wine_pe_image_c,v 1.2 2007/06/13 10:58:29 jakemsr Exp $
--- src/libw32dll/wine/pe_image.c.orig Sun Apr 15 10:42:16 2007
+++ src/libw32dll/wine/pe_image.c Sun May 20 22:40:14 2007
@@ -900,7 +900,7 @@ void PE_UnloadLibrary(WINE_MODREF *wm)
*/
static void extend_stack_for_dll_alloca(void)
{
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
void* mem=alloca(0x20000);
*(int*)mem=0x1234;
#endif

8
multimedia/xine-lib/patches/patch-src_post_deinterlace_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_post_deinterlace_Makefile_in,v 1.6 2009/02/16 01:24:24 sthen Exp $
--- src/post/deinterlace/Makefile.in.orig Tue Feb 10 13:34:59 2009
+++ src/post/deinterlace/Makefile.in Wed Feb 11 00:55:39 2009
@@ -428,7 +428,7 @@ xinepostdir = $(XINE_PLUGINDIR)/post
$OpenBSD: patch-src_post_deinterlace_Makefile_in,v 1.7 2009/04/04 00:28:56 sthen Exp $
--- src/post/deinterlace/Makefile.in.orig Thu Apr 2 14:46:02 2009
+++ src/post/deinterlace/Makefile.in Fri Apr 3 14:42:43 2009
@@ -429,7 +429,7 @@ xinepostdir = $(XINE_PLUGINDIR)/post
vidixdir = $(XINE_PLUGINDIR)/vidix
SUBDIRS = plugins
EXTRA_DIST =

8
multimedia/xine-lib/patches/patch-src_post_deinterlace_plugins_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_post_deinterlace_plugins_Makefile_in,v 1.6 2009/02/16 01:24:24 sthen Exp $
--- src/post/deinterlace/plugins/Makefile.in.orig Tue Feb 10 13:35:00 2009
+++ src/post/deinterlace/plugins/Makefile.in Wed Feb 11 00:55:39 2009
@@ -860,7 +860,7 @@ maintainer-clean-generic:
$OpenBSD: patch-src_post_deinterlace_plugins_Makefile_in,v 1.7 2009/04/04 00:28:56 sthen Exp $
--- src/post/deinterlace/plugins/Makefile.in.orig Thu Apr 2 14:46:02 2009
+++ src/post/deinterlace/plugins/Makefile.in Fri Apr 3 14:42:43 2009
@@ -861,7 +861,7 @@ maintainer-clean-generic:
-rm -f Makefile.in
# Avoid "can't find register" failures with -O0, -O2, -O3 (gcc 4.0)

8
multimedia/xine-lib/patches/patch-src_xine-engine_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_xine-engine_Makefile_in,v 1.9 2009/02/16 01:24:24 sthen Exp $
--- src/xine-engine/Makefile.in.orig Tue Feb 10 13:35:03 2009
+++ src/xine-engine/Makefile.in Wed Feb 11 00:55:39 2009
@@ -437,7 +437,7 @@ libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) \
$OpenBSD: patch-src_xine-engine_Makefile_in,v 1.10 2009/04/04 00:28:56 sthen Exp $
--- src/xine-engine/Makefile.in.orig Thu Apr 2 14:46:05 2009
+++ src/xine-engine/Makefile.in Fri Apr 3 14:42:43 2009
@@ -438,7 +438,7 @@ libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) \
libxine_la_LIBADD = $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS) $(LTLIBINTL) $(ZLIB_LIBS) \
-lm $(XINEUTILS_LIB) $(LTLIBICONV) $(FT2_LIBS) $(FONTCONFIG_LIBS) \

18
multimedia/xine-lib/patches/patch-src_xine-engine_audio_out_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_xine-engine_audio_out_c,v 1.8 2008/02/11 01:17:33 jakemsr Exp $
--- src/xine-engine/audio_out.c.orig Sat Jan 26 17:54:05 2008
+++ src/xine-engine/audio_out.c Sun Feb 10 16:29:11 2008
@@ -1084,7 +1084,7 @@ static void *ao_loop (void *this_gen) {
$OpenBSD: patch-src_xine-engine_audio_out_c,v 1.9 2009/04/04 00:28:56 sthen Exp $
--- src/xine-engine/audio_out.c.orig Sun Mar 15 16:52:55 2009
+++ src/xine-engine/audio_out.c Fri Apr 3 14:42:43 2009
@@ -1089,7 +1089,7 @@ static void *ao_loop (void *this_gen) {
in_buf->format.rate,
in_buf->format.mode) == 0 ) {
in_buf->stream->emergency_brake = 1;
@ -10,7 +10,7 @@ $OpenBSD: patch-src_xine-engine_audio_out_c,v 1.8 2008/02/11 01:17:33 jakemsr Ex
}
}
}
@@ -1115,7 +1115,7 @@ static void *ao_loop (void *this_gen) {
@@ -1120,7 +1120,7 @@ static void *ao_loop (void *this_gen) {
stream = xine_list_get_value (this->streams, ite);
if( !stream->emergency_brake ) {
stream->emergency_brake = 1;
@ -19,7 +19,7 @@ $OpenBSD: patch-src_xine-engine_audio_out_c,v 1.8 2008/02/11 01:17:33 jakemsr Ex
}
}
pthread_mutex_unlock(&this->streams_lock);
@@ -1247,7 +1247,7 @@ static void *ao_loop (void *this_gen) {
@@ -1252,7 +1252,7 @@ static void *ao_loop (void *this_gen) {
if( result < 0 ) {
/* device unplugged. */
xprintf(this->xine, XINE_VERBOSITY_LOG, _("write to sound card failed. Assuming the device was unplugged.\n"));
@ -28,7 +28,7 @@ $OpenBSD: patch-src_xine-engine_audio_out_c,v 1.8 2008/02/11 01:17:33 jakemsr Ex
pthread_mutex_lock( &this->driver_lock );
if(this->driver_open) {
@@ -1261,7 +1261,7 @@ static void *ao_loop (void *this_gen) {
@@ -1266,7 +1266,7 @@ static void *ao_loop (void *this_gen) {
in_buf->format.rate,
in_buf->format.mode) == 0) {
in_buf->stream->emergency_brake = 1;
@ -37,7 +37,7 @@ $OpenBSD: patch-src_xine-engine_audio_out_c,v 1.8 2008/02/11 01:17:33 jakemsr Ex
}
}
pthread_mutex_unlock( &this->driver_lock );
@@ -1499,7 +1499,7 @@ static int ao_open(xine_audio_port_t *this_gen, xine_s
@@ -1514,7 +1514,7 @@ static int ao_open(xine_audio_port_t *this_gen, xine_s
if( !ret ) {
stream->emergency_brake = 1;
@ -46,7 +46,7 @@ $OpenBSD: patch-src_xine-engine_audio_out_c,v 1.8 2008/02/11 01:17:33 jakemsr Ex
return 0;
}
} else {
@@ -2252,7 +2252,9 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_dr
@@ -2279,7 +2279,9 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_dr
this->audio_loop_running = 1;
pthread_attr_init(&pth_attrs);

8
multimedia/xine-lib/patches/patch-src_xine-engine_xine_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_xine-engine_xine_c,v 1.8 2009/02/16 01:24:24 sthen Exp $
--- src/xine-engine/xine.c.orig Tue Feb 10 12:32:24 2009
+++ src/xine-engine/xine.c Wed Feb 11 00:55:26 2009
@@ -1671,7 +1671,7 @@ static void config_save_cb (void *this_gen, xine_cfg_e
$OpenBSD: patch-src_xine-engine_xine_c,v 1.9 2009/04/04 00:28:56 sthen Exp $
--- src/xine-engine/xine.c.orig Wed Feb 18 06:37:43 2009
+++ src/xine-engine/xine.c Fri Apr 3 14:42:43 2009
@@ -1678,7 +1678,7 @@ static void config_save_cb (void *this_gen, xine_cfg_e
pthread_mutex_lock(&this->streams_lock);
if ( (ite = xine_list_front(this->streams)) ) {
stream = xine_list_get_value(this->streams, ite);

14
multimedia/xine-lib/patches/patch-src_xine-utils_cpu_accel_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_xine-utils_cpu_accel_c,v 1.3 2008/09/25 20:43:09 brad Exp $
--- src/xine-utils/cpu_accel.c.orig Tue Sep 23 19:09:01 2008
+++ src/xine-utils/cpu_accel.c Tue Sep 23 19:12:58 2008
@@ -40,6 +40,10 @@
#include "xineutils.h"
+#if defined(PIC) && ! defined(__PIC__)
+#define __PIC__
+#endif
+
#if defined(ARCH_X86) || defined(ARCH_X86_64)
static jmp_buf sigill_return;

14
multimedia/xine-lib/patches/patch-src_xine-utils_mangle_h
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_xine-utils_mangle_h,v 1.1 2008/09/25 20:43:09 brad Exp $
--- src/xine-utils/mangle.h.orig Tue Sep 23 19:07:38 2008
+++ src/xine-utils/mangle.h Tue Sep 23 19:12:32 2008
@@ -29,6 +29,10 @@
#ifndef _XINE_MANGLE_H
#define _XINE_MANGLE_H
+#if defined(PIC) && ! defined(__PIC__)
+#define __PIC__
+#endif
+
// Use rip-relative addressing if compiling PIC code on x86-64.
#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__DJGPP__) || \
defined(__OS2__) || (defined (__OpenBSD__) && !defined(__ELF__))