kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update to 1.0

Browse source 
changes:
-security issue regarding the AIFF demuxer (CAN-2004-1300)
-Xv plugin dynamically linked again
-some fixes
This commit is contained in:
drochner 2005-01-06 17:04:42 +00:00
parent 4a1815b7bf
commit f87525f0ac
8 changed files with 37 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
multimedia/xine-lib/Makefile
View file

@ -1,9 +1,7 @@
# $NetBSD: Makefile,v 1.16 2005/01/06 12:04:08 tron Exp $
# $NetBSD: Makefile,v 1.17 2005/01/06 17:04:42 drochner Exp $
.include "Makefile.common"
PKGREVISION= 2
.if ${MACHINE_ARCH} == "i386"
DEPENDS+= win32-codecs>=011227:../../multimedia/win32-codecs
PLIST_SUBST+= I386=""

7
multimedia/xine-lib/Makefile.common
View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile.common,v 1.15 2004/12/23 03:05:53 xtraeme Exp $
# $NetBSD: Makefile.common,v 1.16 2005/01/06 17:04:42 drochner Exp $
#
DISTNAME= xine-lib-1-rc8
XINE_PKGNAME= xine-lib-1rc8
DISTNAME= xine-lib-1.0
XINE_PKGNAME= xine-lib-1.0
PKGNAME?= ${XINE_PKGNAME}
CATEGORIES?= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
@ -27,7 +27,6 @@ USE_GNU_TOOLS+= make
CONFIGURE_ARGS+= --with-w32-path='${PREFIX}/lib/win32'
CONFIGURE_ARGS+= --without-external-ffmpeg --disable-ffmpegtest
CONFIGURE_ARGS+= --enable-shared-xv
CONFIGURE_ENV+= have_libpng="yes"
CONFIGURE_ENV+= PNG_CFLAGS="-I${PREFIX}/include"
CONFIGURE_ENV+= PNG_LIBS="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpng"

14
multimedia/xine-lib/distinfo
View file

@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.12 2005/01/06 12:04:08 tron Exp $
$NetBSD: distinfo,v 1.13 2005/01/06 17:04:42 drochner Exp $
SHA1 (xine-lib-1-rc8.tar.gz) = de130119fa177273e3c16186b24e347ebba8d7b6
Size (xine-lib-1-rc8.tar.gz) = 7354157 bytes
SHA1 (xine-lib-1.0.tar.gz) = dd02fb31c68ae68e2283d02e16bb8e80fcced9fd
Size (xine-lib-1.0.tar.gz) = 7384258 bytes
SHA1 (patch-aa) = beb7617b8361c06cf5224f0027731f025f7dc519
SHA1 (patch-ab) = a5205d23d02dff84b0e8a9f850f3833cacc28c5a
SHA1 (patch-ac) = 7959d6d3599c9debe79b1b4a5749b6af714588a0
@ -10,17 +10,15 @@ SHA1 (patch-ae) = cf7486ed50a782fcfb17ad0985e76a7ae09a2938
SHA1 (patch-ag) = 1a439f8025c07d183f054fea77a70ef86ff59217
SHA1 (patch-ah) = 3f9b23c4a7994259056b73209a9e194db759f06d
SHA1 (patch-ai) = f71e3cb57bf30cbf9653a469c040b6e3f717ba97
SHA1 (patch-aj) = 2b3b086e24460eca0b611ea07b2ada11bfa5ce79
SHA1 (patch-am) = 10f6433a8549bdce60ace5dcbd51df85eaa7ea16
SHA1 (patch-ao) = 9df576ba11a393c3a8e886e7a9948b2adc5f2ba2
SHA1 (patch-ao) = 1247ba7ef23f2b28b2c0a177208c912e2fc259a0
SHA1 (patch-ap) = aaf63024c1049c1f2175d9974367a6b84ac3028f
SHA1 (patch-aq) = 897bc7a6e4e014c8c6b5e4c2c0173a9d1a8f5dbe
SHA1 (patch-aq) = f4e37c33cd4653542b53bd8b4c2c7bf2620cbb0e
SHA1 (patch-ar) = c0053ebca44544c42e39aab775e8441b6e9faa30
SHA1 (patch-as) = ad09d98ba79cdaa0367589658d7fa05a78d075ba
SHA1 (patch-au) = 569ac1d00402eb3679bf99f0afe5832f425b3b0e
SHA1 (patch-av) = 56f462e6091a72e87544ece689557d60fbb749aa
SHA1 (patch-ba) = a527975fe9675358090bddc1361b707aa122f89b
SHA1 (patch-bb) = 40978e50dcb060a2b8314b310a68684e62e90bc2
SHA1 (patch-bc) = b0ad58ac1f06cebe5990caeeeff5a5e3e40d480b
SHA1 (patch-bd) = 5352293022da25b08598d42655af2524ff99b28a
SHA1 (patch-be) = 6555d60cc134d62f65adf52c9034b638c340a9cd
SHA1 (patch-be) = de3f7fe1f595ef5696379b183b661197745971a2

14
multimedia/xine-lib/patches/patch-aj
View file

@ -1,14 +0,0 @@
$NetBSD: patch-aj,v 1.3 2005/01/06 12:04:08 tron Exp $
--- src/demuxers/demux_aiff.c.orig 2004-06-13 22:28:52.000000000 +0100
+++ src/demuxers/demux_aiff.c 2005-01-06 11:38:44.000000000 +0000
@@ -122,7 +122,8 @@
chunk_size = BE_32(&preamble[4]);
if (chunk_type == COMM_TAG) {
- if (this->input->read(this->input, buffer, chunk_size) !=
+ if (chunk_size > sizeof (buffer) ||
+ this->input->read(this->input, buffer, chunk_size) !=
chunk_size) {
this->status = DEMUX_FINISHED;
return 0;

24
multimedia/xine-lib/patches/patch-ao
View file

@ -1,8 +1,17 @@
$NetBSD: patch-ao,v 1.5 2004/12/21 18:56:44 drochner Exp $
$NetBSD: patch-ao,v 1.6 2005/01/06 17:04:42 drochner Exp $
--- src/libw32dll/wine/Makefile.in.orig 2004-12-15 14:02:43.000000000 +0100
--- src/libw32dll/wine/Makefile.in.orig 2004-12-25 23:36:16.000000000 +0100
+++ src/libw32dll/wine/Makefile.in
@@ -368,6 +368,7 @@ VORBIS_LIBS = @VORBIS_LIBS@
@@ -65,7 +65,7 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
-libwine_la_LIBADD =
+libwine_la_LIBADD = ${WINE_LIBS}
am_libwine_la_OBJECTS = afl.lo driver.lo elfdll.lo ext.lo \
ldt_keeper.lo module.lo pe_image.lo pe_resource.lo resource.lo \
registry.lo vfl.lo win32.lo stubs.lo wrapper.lo
@@ -421,6 +421,7 @@ VORBIS_LIBS = @VORBIS_LIBS@
W32DLL_DEP = @W32DLL_DEP@
W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
@ -10,12 +19,3 @@ $NetBSD: patch-ao,v 1.5 2004/12/21 18:56:44 drochner Exp $
WIN32_FALSE = @WIN32_FALSE@
WIN32_TRUE = @WIN32_TRUE@
XGETTEXT = @XGETTEXT@
@@ -528,7 +529,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libwine_la_LDFLAGS =
-libwine_la_LIBADD =
+libwine_la_LIBADD = ${WINE_LIBS}
am_libwine_la_OBJECTS = afl.lo driver.lo elfdll.lo ext.lo ldt_keeper.lo \
module.lo pe_image.lo pe_resource.lo resource.lo registry.lo \
vfl.lo win32.lo stubs.lo wrapper.lo

16
multimedia/xine-lib/patches/patch-aq
View file

@ -1,21 +1,21 @@
$NetBSD: patch-aq,v 1.2 2004/12/21 18:56:44 drochner Exp $
$NetBSD: patch-aq,v 1.3 2005/01/06 17:04:42 drochner Exp $
--- src/dxr3/Makefile.in.orig 2004-12-15 14:02:28.000000000 +0100
--- src/dxr3/Makefile.in.orig 2004-12-25 23:35:02.000000000 +0100
+++ src/dxr3/Makefile.in
@@ -458,6 +458,7 @@ AM_CFLAGS = $(X_CFLAGS) $(LIBFAME_CFLAGS
@@ -548,6 +548,7 @@ AM_CFLAGS = $(X_CFLAGS) $(LIBFAME_CFLAGS
@HAVE_X11_TRUE@link_x_libs = $(X_LIBS) -lXext
@HAVE_LIBFAME_TRUE@link_fame = $(LIBFAME_LIBS)
@HAVE_LIBRTE_TRUE@link_rte = -lrte
+@HAVE_XINERAMA_TRUE@link_xinerama = -lXinerama
lib_LTLIBRARIES = $(dxr3_modules)
@@ -481,7 +482,7 @@ xineplug_vo_out_dxr3_la_SOURCES = \
xineplug_decode_dxr3_video_la_SOURCES = dxr3_decode_video.c
xineplug_decode_dxr3_video_la_LIBADD = $(XINE_LIB)
@@ -566,7 +567,7 @@ xineplug_vo_out_dxr3_la_SOURCES = \
dxr3_scr.c \
video_out_dxr3.c
-xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB)
+xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_xinerama) $(link_x_libs) $(XINE_LIB)
xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module
noinst_HEADERS = \
em8300.h \

19
multimedia/xine-lib/patches/patch-bc
View file

@ -1,19 +0,0 @@
$NetBSD: patch-bc,v 1.1 2004/12/21 18:56:44 drochner Exp $
--- aclocal.m4.orig 2004-12-18 01:22:24.000000000 +0100
+++ aclocal.m4
@@ -7886,14 +7886,6 @@ if test x"$external_ffmpeg" != "xno"; th
CPPFLAGS="${FFMPEG_CPPFLAGS} ${ac_save_CPPFLAGS}"
LDFLAGS="${FFMPEG_LIBS} ${ac_save_LDFLAGS}"
- dnl drop the cache
- for i in "ac_cv_header_avcodec_h" "ac_cv_header_postprocess_h" \
- "ac_cv_lib_avcodec_pp_get_context" \
- "ac_cv_lib_postproc_pp_get_context" \
- "ac_cv_lib_avcodec_register_avcodec"; do
- $as_unset $i || test "${$i+set}" != set || { $i=; export $i; }
- done
-
dnl look for headers
AC_CHECK_HEADER(avcodec.h, , continue)
AC_CHECK_HEADER(postprocess.h, , continue)

14
multimedia/xine-lib/patches/patch-be
View file

@ -1,8 +1,8 @@
$NetBSD: patch-be,v 1.1 2004/12/23 03:05:53 xtraeme Exp $
$NetBSD: patch-be,v 1.2 2005/01/06 17:04:42 drochner Exp $
--- src/audio_out/Makefile.in.orig 2004-12-15 14:02:27.000000000 +0100
+++ src/audio_out/Makefile.in 2004-12-23 02:16:38.000000000 +0100
@@ -310,6 +310,7 @@
--- src/audio_out/Makefile.in.orig 2004-12-25 23:34:57.000000000 +0100
+++ src/audio_out/Makefile.in
@@ -437,6 +437,7 @@ OGG_CFLAGS = @OGG_CFLAGS@
OGG_LIBS = @OGG_LIBS@
OPENGL_CFLAGS = @OPENGL_CFLAGS@
OPENGL_LIBS = @OPENGL_LIBS@
@ -10,12 +10,12 @@ $NetBSD: patch-be,v 1.1 2004/12/23 03:05:53 xtraeme Exp $
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -508,7 +509,7 @@
@@ -623,7 +624,7 @@ xineplug_ao_out_file_la_SOURCES = audio_
xineplug_ao_out_file_la_LIBADD = $(XINE_LIB)
xineplug_ao_out_file_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c
-xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB)
+xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB) $(OSS_LIBS)
xineplug_ao_out_oss_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c
xineplug_ao_out_alsa_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB)