diff --git a/x11/kde/multimedia3/Makefile b/x11/kde/multimedia3/Makefile index 5dc6949937c..3e7bfa40fe1 100644 --- a/x11/kde/multimedia3/Makefile +++ b/x11/kde/multimedia3/Makefile @@ -1,13 +1,12 @@ -# $OpenBSD: Makefile,v 1.33 2006/01/13 22:49:56 espie Exp $ +# $OpenBSD: Makefile,v 1.34 2006/02/16 08:25:11 espie Exp $ COMMENT= "K Desktop Environment, multimedia applications" CATEGORIES= x11 x11/kde -VERSION= 3.4.3 +VERSION= 3.5.1 DISTNAME= kdemultimedia-${VERSION} -PKGNAME= ${DISTNAME}p1 -MODKDE_VERSION= 3.4 -SHARED_LIBS= akode 2.0 \ - arts_mpeglib-0.3.0 1.0 \ +PKGNAME= ${DISTNAME} +MODKDE_VERSION= 3.5 +SHARED_LIBS= arts_mpeglib-0.3.0 1.0 \ arts_mpeglib 1.0 \ arts_splay 1.0 \ artsbuilder 1.0 \ @@ -45,7 +44,8 @@ LIB_DEPENDS= DCOP,kdecore.6,kdefakes,kdefx,kdesu,kdeui,kio,khtml,kmid,kparts,kme popt::devel/popt \ gstreamer-0.8.0.0::devel/gstreamer \ ltdl::devel/libtool,-ltdl \ - theora::multimedia/libtheora + theora::multimedia/libtheora \ + ::devel/gstreamer-plugins EXTRA_CONFIG= xdg/menus/applications-merged/kde-multimedia-music.menu SAMPLECONFDIR=${PREFIX}/share/apps/kde-conf-sample diff --git a/x11/kde/multimedia3/distinfo b/x11/kde/multimedia3/distinfo index ea5659d0dc1..013d54cba5f 100644 --- a/x11/kde/multimedia3/distinfo +++ b/x11/kde/multimedia3/distinfo @@ -1,4 +1,4 @@ -MD5 (kde/kdemultimedia-3.4.3.tar.bz2) = 49fed5afad01c322d3bc8c6a175d1898 -RMD160 (kde/kdemultimedia-3.4.3.tar.bz2) = 318ebd3149019ec2e5d98b57a548d3ef350a7924 -SHA1 (kde/kdemultimedia-3.4.3.tar.bz2) = 8916577123446be621527603b31febb9997609ba -SIZE (kde/kdemultimedia-3.4.3.tar.bz2) = 5495757 +MD5 (kde/kdemultimedia-3.5.1.tar.bz2) = 595f637c637987a92f6dac9d9cd6667d +RMD160 (kde/kdemultimedia-3.5.1.tar.bz2) = 3bd70140c078c8c3ba8c786970f63cc58355e6d4 +SHA1 (kde/kdemultimedia-3.5.1.tar.bz2) = ce75b5d6639fe26eac6d81858264ba9196d450ba +SIZE (kde/kdemultimedia-3.5.1.tar.bz2) = 5502185 diff --git a/x11/kde/multimedia3/patches/patch-configure_in b/x11/kde/multimedia3/patches/patch-configure_in index 854ba05e50a..b555bb1dcef 100644 --- a/x11/kde/multimedia3/patches/patch-configure_in +++ b/x11/kde/multimedia3/patches/patch-configure_in @@ -1,39 +1,54 @@ -$OpenBSD: patch-configure_in,v 1.20 2005/12/15 15:42:24 naddy Exp $ ---- configure.in.orig Fri Oct 7 01:57:47 2005 -+++ configure.in Thu Dec 15 06:35:47 2005 -@@ -183,11 +183,11 @@ AC_CHECK_HEADER(vorbis/vorbisfile.h, +$OpenBSD: patch-configure_in,v 1.21 2006/02/16 08:25:11 espie Exp $ +--- configure.in.orig Fri Jan 20 18:47:07 2006 ++++ configure.in Wed Feb 15 12:23:08 2006 +@@ -164,22 +164,22 @@ AC_DEFUN([KDE_CHECK_OGGVORBIS], + [:], [have_oggvorbis=no]) - AC_CHECK_LIB(vorbisfile, ov_open, - [USELESS_VAR=1], -- [oggv_have_vorbis=""], -lvorbis -logg) -+ [oggv_have_vorbis=""], -lvorbis -logg -lm) + KDE_CHECK_LIB(vorbis, vorbis_info_init, +- [:], [have_oggvorbis=no]) ++ [:], [have_oggvorbis=no], -logg -lm) - AC_CHECK_LIB(vorbis, vorbis_info_init, - [USELESS_VAR=1], -- [oggv_have_vorbis=""]) -+ [oggv_have_vorbis=""], -logg -lm) + KDE_CHECK_LIB(vorbisfile, ov_open, +- [:], [have_oggvorbis=no], -lvorbis -logg) ++ [:], [have_oggvorbis=no], -lvorbis -logg -lm) - AC_CHECK_LIB(ogg, ogg_page_version, - [USELESS_VAR=1], -@@ -321,7 +321,7 @@ int main () - AC_MSG_RESULT($msg) - AC_DEFINE_UNQUOTED(HAVE_VORBIS, $have_vorbis_value, [Define if you have vorbis]) - VORBISFILE_LIBS="-lvorbisfile" -- VORBISENC_LIBS="-lvorbisenc -lvorbis -logg" -+ VORBISENC_LIBS="-lvorbisenc -lvorbis -logg -lm" - KCM_AUDIOCD="kcmaudiocd" - KAUDIOCREATOR="kaudiocreator" - else -@@ -381,7 +381,7 @@ KDE_CHECK_HEADER(theora/theora.h, + KDE_CHECK_LIB(vorbisenc, vorbis_encode_init, +- [:], [have_oggvorbis=no], -lvorbis -logg) ++ [:], [have_oggvorbis=no], -lvorbis -logg -lm) + + KDE_CHECK_LIB(vorbisenc, vorbis_bitrate_addblock, + [have_vorbis_value=2], [have_vorbis_value=1]) + + if test "x$have_oggvorbis" = xyes; then + # for akode/plugins/xiph_decoder/ kioslave/audiocd/plugins/ and krec/ogg_export/ +- VORBIS_LIBS="-lvorbis -logg" +- VORBISFILE_LIBS="-lvorbisfile" +- VORBISENC_LIBS="-lvorbisenc" ++ VORBIS_LIBS="-lvorbis -logg -lm" ++ VORBISFILE_LIBS="-lvorbisfile -lm" ++ VORBISENC_LIBS="-lvorbisenc -lm" + + # for akode/plugins/xiph_decoder/ + AC_DEFINE_UNQUOTED(HAVE_OGG_VORBIS, 1, [Define if you have ogg/vorbis installed]) +@@ -188,7 +188,7 @@ AC_DEFUN([KDE_CHECK_OGGVORBIS], + AC_DEFINE_UNQUOTED(HAVE_VORBIS, $have_vorbis_value, [Define if you ogg/vorbis installed]) + + # for mpeglib/ +- OGG_VORBISLIBS="-lvorbisfile -lvorbis -logg" ++ OGG_VORBISLIBS="-lvorbisfile -lvorbis -logg -lm" + AC_DEFINE(OGG_VORBIS, 1, [Define if you have ogg/vorbis installed]) + fi + +@@ -889,7 +889,7 @@ KDE_CHECK_HEADER(theora/theora.h, + [], [have_theora=no]) KDE_CHECK_LIB(theora, theora_info_init, - [USELESS_VAR=1], -- [oggv_have_theora=""], -ltheora -lvorbis -logg) -+ [oggv_have_theora=""], -ltheora -lvorbis -logg -lm) - +- [], [have_theora=no], [-lvorbis -logg]) ++ [], [have_theora=no], [-lvorbis -logg -lm]) ]) -@@ -579,7 +579,7 @@ AC_DEFUN([AC_CHECK_LIBOGGFLAC], + AC_ARG_WITH(theora, +@@ -939,7 +939,7 @@ AC_DEFUN([AC_CHECK_LIBOGGFLAC], KDE_CHECK_HEADER(OggFLAC/seekable_stream_decoder.h, [ KDE_CHECK_LIB(OggFLAC,OggFLAC__seekable_stream_decoder_process_single, @@ -42,21 +57,7 @@ $OpenBSD: patch-configure_in,v 1.20 2005/12/15 15:42:24 naddy Exp $ ]) if test "x$have_libOggFLAC" = "xyes"; then -@@ -1891,11 +1891,11 @@ AC_MSG_RESULT($ogg_vorbis) - if test x$ogg_vorbis = xyes; then - dnl we need the ogg_vorbis_lib because otherwise we override LIBS ! - AC_CHECK_LIB(vorbisfile,ov_open,ogg_vorbis_lib=yes, -- ogg_vorbis=no,[-lvorbisfile -lvorbis -logg]) -+ ogg_vorbis=no,[-lvorbisfile -lvorbis -logg -lm]) - fi - if test x$ogg_vorbis = xyes; then - AC_DEFINE(OGG_VORBIS,1,[Define if you have ogg/vorbis installed]) -- OGG_VORBISLIBS="-lvorbisfile -lvorbis -logg" -+ OGG_VORBISLIBS="-lvorbisfile -lvorbis -logg -lm" - fi - fi - -@@ -1929,6 +1929,9 @@ case "$OS_TYPE" in +@@ -1285,6 +1285,9 @@ case "$OS_TYPE" in NetBSD) kde_mpeglib_compiles=yes ;; @@ -66,7 +67,7 @@ $OpenBSD: patch-configure_in,v 1.20 2005/12/15 15:42:24 naddy Exp $ Linux) kde_mpeglib_compiles=yes ;; -@@ -1956,6 +1959,12 @@ case "$OS_TYPE" in +@@ -1312,6 +1315,12 @@ case "$OS_TYPE" in AC_DEFINE(OS_Linux,1,[Define if you have linux pthread]) ;; @@ -79,9 +80,9 @@ $OpenBSD: patch-configure_in,v 1.20 2005/12/15 15:42:24 naddy Exp $ FreeBSD) OS_TYPE="BSD" AC_DEFINE(OS_BSD,1,[Define if you have BSD pthread]) -@@ -1999,7 +2008,7 @@ KDE_MPEGLIB_COMPILES +@@ -1355,7 +1364,7 @@ KDE_MPEGLIB_COMPILES - THIS_LIB_LIBS="-lX11 -lXext -lm -lstdc++ ${XVLIBS} ${DGALIBS} " + THIS_LIB_LIBS="-lX11 -lXext -lm ${XVLIBS} ${DGALIBS} " THIS_LIB_LIBS="${THIS_LIB_LIBS} ${XVIDMODELIBS} ${SDLLIB} ${CDDALIBS} " -THIS_LIB_LIBS="${THIS_LIB_LIBS} ${OGG_VORBISLIBS} ${LIBPTHREAD}" +THIS_LIB_LIBS="${THIS_LIB_LIBS} ${OGG_VORBISLIBS} ${LIBPTHREAD} ${LIBOSSAUDIO}" diff --git a/x11/kde/multimedia3/patches/patch-kscd_Makefile_in b/x11/kde/multimedia3/patches/patch-kscd_Makefile_in index 77f26a09a45..5b307f00551 100644 --- a/x11/kde/multimedia3/patches/patch-kscd_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-kscd_Makefile_in @@ -1,21 +1,21 @@ -$OpenBSD: patch-kscd_Makefile_in,v 1.13 2005/10/17 11:28:25 espie Exp $ ---- kscd/Makefile.in.orig Fri Oct 7 10:00:41 2005 -+++ kscd/Makefile.in Sun Oct 16 22:40:18 2005 -@@ -70,7 +70,7 @@ kscd_OBJECTS = kvolumecontrol.$(OBJEXT) - ledlamp.$(OBJEXT) docking.$(OBJEXT) bwlednum.$(OBJEXT) \ - configWidget.$(OBJEXT) cddbdlg.$(OBJEXT) kscd_skel.$(OBJEXT) panel.$(OBJEXT) configWidgetUI.$(OBJEXT) prefs.$(OBJEXT) - am__DEPENDENCIES_1 = --kscd_DEPENDENCIES = $(top_builddir)/kscd/libwm/libworkman.la \ -+kscd_DEPENDENCIES = $(top_builddir)/kscd/libwm/libkworkman.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/libkcddb/libkcddb.la -@@ -543,7 +543,7 @@ kscd_SOURCES=kvolumecontrol.cpp kscd.cp +$OpenBSD: patch-kscd_Makefile_in,v 1.14 2006/02/16 08:25:11 espie Exp $ +--- kscd/Makefile.in.orig Thu Feb 16 00:03:02 2006 ++++ kscd/Makefile.in Thu Feb 16 00:03:12 2006 +@@ -58,7 +58,7 @@ CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) + libkcompactdisc_la_DEPENDENCIES = \ +- $(top_builddir)/kscd/libwm/libworkman.la ++ $(top_builddir)/kscd/libwm/libkworkman.la + am_libkcompactdisc_la_OBJECTS = kcompactdisc.lo + #>- libkcompactdisc_la_OBJECTS = $(am_libkcompactdisc_la_OBJECTS) + #>+ 1 +@@ -526,7 +526,7 @@ kscd_SOURCES= kscd.cpp ledlamp.cpp \ + noinst_LTLIBRARIES = libkcompactdisc.la + libkcompactdisc_la_SOURCES = kcompactdisc.cpp +-libkcompactdisc_la_LIBADD = $(top_builddir)/kscd/libwm/libworkman.la ++libkcompactdisc_la_LIBADD = $(top_builddir)/kscd/libwm/libkworkman.la kde_kcfg_DATA = kscd.kcfg kscd_LDFLAGS = $(all_libraries) $(KDE_RPATH) --kscd_LDADD = $(top_builddir)/kscd/libwm/libworkman.la \ -+kscd_LDADD = $(top_builddir)/kscd/libwm/libkworkman.la \ - $(LIBCDROM) $(LIBCDAUDIO) $(LIBFPE) $(LIB_KIO) -lkutils $(top_builddir)/libkcddb/libkcddb.la - - profiledata_DATA = kscd.profile.xml + kscd_LDADD = $(LIBCDROM) $(LIBCDAUDIO) \ diff --git a/x11/kde/multimedia3/patches/patch-kscd_libwm_Makefile_am b/x11/kde/multimedia3/patches/patch-kscd_libwm_Makefile_am index 5762edddc52..5bc1305b538 100644 --- a/x11/kde/multimedia3/patches/patch-kscd_libwm_Makefile_am +++ b/x11/kde/multimedia3/patches/patch-kscd_libwm_Makefile_am @@ -1,6 +1,6 @@ -$OpenBSD: patch-kscd_libwm_Makefile_am,v 1.7 2005/03/29 21:18:36 espie Exp $ ---- kscd/libwm/Makefile.am.orig Thu Feb 3 23:48:26 2005 -+++ kscd/libwm/Makefile.am Sat Mar 26 10:34:19 2005 +$OpenBSD: patch-kscd_libwm_Makefile_am,v 1.8 2006/02/16 08:25:11 espie Exp $ +--- kscd/libwm/Makefile.am.orig Sat Sep 10 10:19:56 2005 ++++ kscd/libwm/Makefile.am Wed Feb 15 12:13:03 2006 @@ -1,5 +1,5 @@ # -# Makefile.am for libworkman. Based on the example Makefile.am for a diff --git a/x11/kde/multimedia3/patches/patch-kscd_libwm_Makefile_in b/x11/kde/multimedia3/patches/patch-kscd_libwm_Makefile_in index 2c22326ea5b..8ddddd74819 100644 --- a/x11/kde/multimedia3/patches/patch-kscd_libwm_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-kscd_libwm_Makefile_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-kscd_libwm_Makefile_in,v 1.14 2005/10/17 11:28:25 espie Exp $ ---- kscd/libwm/Makefile.in.orig Fri Oct 7 10:00:41 2005 -+++ kscd/libwm/Makefile.in Sun Oct 16 22:41:52 2005 +$OpenBSD: patch-kscd_libwm_Makefile_in,v 1.15 2006/02/16 08:25:11 espie Exp $ +--- kscd/libwm/Makefile.in.orig Fri Jan 20 18:48:35 2006 ++++ kscd/libwm/Makefile.in Wed Feb 15 12:13:03 2006 @@ -16,7 +16,7 @@ @SET_MAKE@ @@ -56,7 +56,7 @@ $OpenBSD: patch-kscd_libwm_Makefile_in,v 1.14 2005/10/17 11:28:25 espie Exp $ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ #>- html-recursive info-recursive install-data-recursive \ #>- install-exec-recursive install-info-recursive \ -@@ -503,10 +503,10 @@ xine_artsplugin_SUBDIR_included_TRUE = @ +@@ -481,10 +481,10 @@ xine_artsplugin_SUBDIR_included_TRUE = @ subdirs = include SUBDIRS = audio INCLUDES = $(all_includes) @@ -71,7 +71,7 @@ $OpenBSD: patch-kscd_libwm_Makefile_in,v 1.14 2005/10/17 11:28:25 espie Exp $ database.c index.c scsi.c cdda.c plat_linux_cdda.c plat_sun_cdda.c\ plat_aix.c plat_bsd386.c plat_freebsd.c plat_hpux.c plat_irix.c \ plat_linux.c plat_svr4.c plat_ultrix.c plat_news.c plat_openbsd.c \ -@@ -570,8 +570,8 @@ clean-noinstLTLIBRARIES: +@@ -548,8 +548,8 @@ clean-noinstLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done @@ -82,7 +82,7 @@ $OpenBSD: patch-kscd_libwm_Makefile_in,v 1.14 2005/10/17 11:28:25 espie Exp $ mostlyclean-compile: -rm -f *.$(OBJEXT) -@@ -913,8 +913,8 @@ uninstall-info: uninstall-info-recursive +@@ -891,8 +891,8 @@ uninstall-info: uninstall-info-recursive tags tags-recursive uninstall uninstall-am uninstall-info-am @@ -93,7 +93,7 @@ $OpenBSD: patch-kscd_libwm_Makefile_in,v 1.14 2005/10/17 11:28:25 espie Exp $ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -@@ -965,19 +965,19 @@ bcheck-am: +@@ -943,19 +943,19 @@ bcheck-am: #>+ 3 final: @@ -116,4 +116,4 @@ $OpenBSD: patch-kscd_libwm_Makefile_in,v 1.14 2005/10/17 11:28:25 espie Exp $ + $(MAKE) libkworkman_la_OBJECTS="$(libkworkman_la_nofinal_OBJECTS)" install-am #>+ 3 - cvs-clean: + kde-rpo-clean: diff --git a/x11/kde/multimedia3/patches/patch-kscd_libwm_include_wm_cdda_h b/x11/kde/multimedia3/patches/patch-kscd_libwm_include_wm_cdda_h index f3a0dff9590..02df4779f49 100644 --- a/x11/kde/multimedia3/patches/patch-kscd_libwm_include_wm_cdda_h +++ b/x11/kde/multimedia3/patches/patch-kscd_libwm_include_wm_cdda_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-kscd_libwm_include_wm_cdda_h,v 1.2 2004/09/18 09:36:44 espie Exp $ ---- kscd/libwm/include/wm_cdda.h.orig Sat Jul 17 21:09:14 2004 -+++ kscd/libwm/include/wm_cdda.h Tue Sep 7 17:25:44 2004 +$OpenBSD: patch-kscd_libwm_include_wm_cdda_h,v 1.3 2006/02/16 08:25:11 espie Exp $ +--- kscd/libwm/include/wm_cdda.h.orig Sat Sep 10 10:19:56 2005 ++++ kscd/libwm/include/wm_cdda.h Wed Feb 15 12:13:03 2006 @@ -82,6 +82,7 @@ struct cdda_device { */ diff --git a/x11/kde/multimedia3/patches/patch-kscd_libwm_include_wm_config_h b/x11/kde/multimedia3/patches/patch-kscd_libwm_include_wm_config_h index 90ecbfbea80..483ab0d3818 100644 --- a/x11/kde/multimedia3/patches/patch-kscd_libwm_include_wm_config_h +++ b/x11/kde/multimedia3/patches/patch-kscd_libwm_include_wm_config_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-kscd_libwm_include_wm_config_h,v 1.3 2004/03/07 21:08:44 espie Exp $ ---- kscd/libwm/include/wm_config.h.orig 2004-03-07 14:02:43.000000000 +0100 -+++ kscd/libwm/include/wm_config.h 2004-03-07 14:03:16.000000000 +0100 +$OpenBSD: patch-kscd_libwm_include_wm_config_h,v 1.4 2006/02/16 08:25:11 espie Exp $ +--- kscd/libwm/include/wm_config.h.orig Sat Sep 10 10:19:56 2005 ++++ kscd/libwm/include/wm_config.h Wed Feb 15 12:13:03 2006 @@ -173,6 +173,12 @@ #endif /* hpux */ diff --git a/x11/kde/multimedia3/patches/patch-kscd_libwm_plat_openbsd_c b/x11/kde/multimedia3/patches/patch-kscd_libwm_plat_openbsd_c index 1e75b062e42..166f9bfb4d0 100644 --- a/x11/kde/multimedia3/patches/patch-kscd_libwm_plat_openbsd_c +++ b/x11/kde/multimedia3/patches/patch-kscd_libwm_plat_openbsd_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-kscd_libwm_plat_openbsd_c,v 1.5 2005/06/04 12:12:10 naddy Exp $ ---- kscd/libwm/plat_openbsd.c.orig Mon May 23 06:06:56 2005 -+++ kscd/libwm/plat_openbsd.c Sat Jun 4 05:00:08 2005 +$OpenBSD: patch-kscd_libwm_plat_openbsd_c,v 1.6 2006/02/16 08:25:11 espie Exp $ +--- kscd/libwm/plat_openbsd.c.orig Sat Sep 10 10:19:56 2005 ++++ kscd/libwm/plat_openbsd.c Wed Feb 15 12:13:03 2006 @@ -57,7 +57,6 @@ #include #include diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_configure_in_in b/x11/kde/multimedia3/patches/patch-mpeglib_configure_in_in index 2405449f25a..634d108020d 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_configure_in_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_configure_in_in @@ -1,6 +1,6 @@ ---- mpeglib/configure.in.in.orig Thu Feb 3 23:48:26 2005 -+++ mpeglib/configure.in.in Sat Mar 26 10:30:28 2005 -@@ -217,6 +217,9 @@ case "$OS_TYPE" in +--- mpeglib/configure.in.in.orig Thu Jan 19 17:40:35 2006 ++++ mpeglib/configure.in.in Wed Feb 15 12:13:03 2006 +@@ -164,6 +164,9 @@ case "$OS_TYPE" in NetBSD) kde_mpeglib_compiles=yes ;; @@ -10,7 +10,7 @@ Linux) kde_mpeglib_compiles=yes ;; -@@ -244,6 +247,12 @@ case "$OS_TYPE" in +@@ -191,6 +194,12 @@ case "$OS_TYPE" in AC_DEFINE(OS_Linux,1,[Define if you have linux pthread]) ;; @@ -23,9 +23,9 @@ FreeBSD) OS_TYPE="BSD" AC_DEFINE(OS_BSD,1,[Define if you have BSD pthread]) -@@ -287,5 +296,5 @@ KDE_MPEGLIB_COMPILES +@@ -234,5 +243,5 @@ KDE_MPEGLIB_COMPILES - THIS_LIB_LIBS="-lX11 -lXext -lm -lstdc++ ${XVLIBS} ${DGALIBS} " + THIS_LIB_LIBS="-lX11 -lXext -lm ${XVLIBS} ${DGALIBS} " THIS_LIB_LIBS="${THIS_LIB_LIBS} ${XVIDMODELIBS} ${SDLLIB} ${CDDALIBS} " -THIS_LIB_LIBS="${THIS_LIB_LIBS} ${OGG_VORBISLIBS} ${LIBPTHREAD}" +THIS_LIB_LIBS="${THIS_LIB_LIBS} ${OGG_VORBISLIBS} ${LIBPTHREAD} ${LIBOSSAUDIO}" diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_cddaplay_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_cddaplay_Makefile_in index 7d8536cbef3..426cce44181 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_example_cddaplay_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_cddaplay_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-mpeglib_example_cddaplay_Makefile_in,v 1.13 2005/10/17 11:28:25 espie Exp $ ---- mpeglib/example/cddaplay/Makefile.in.orig Fri Oct 7 10:00:42 2005 -+++ mpeglib/example/cddaplay/Makefile.in Sun Oct 16 22:40:18 2005 -@@ -176,7 +176,7 @@ LAME_INCS = @LAME_INCS@ +$OpenBSD: patch-mpeglib_example_cddaplay_Makefile_in,v 1.14 2006/02/16 08:25:11 espie Exp $ +--- mpeglib/example/cddaplay/Makefile.in.orig Fri Jan 20 18:48:35 2006 ++++ mpeglib/example/cddaplay/Makefile.in Wed Feb 15 12:13:03 2006 +@@ -171,7 +171,7 @@ KDE_USE_PIE = @KDE_USE_PIE@ + KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ LAME_LIBS = @LAME_LIBS@ - LAME_RPATH = @LAME_RPATH@ LDADD_GST = @LDADD_GST@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ -L../../lib/.libs LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ LDFLAGS_GST = @LDFLAGS_GST@ LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -@@ -484,7 +484,7 @@ xine_artsplugin_SUBDIR_included_TRUE = @ +@@ -462,7 +462,7 @@ xine_artsplugin_SUBDIR_included_TRUE = @ INCLUDES = -I../../include $(all_includes) cddaplay_SOURCES = cddaplay.cpp noinst_HEADERS = diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_mpgplay_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_mpgplay_Makefile_in index b9acb1cf40b..3dcd8ae5521 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_example_mpgplay_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_mpgplay_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-mpeglib_example_mpgplay_Makefile_in,v 1.13 2005/10/17 11:28:25 espie Exp $ ---- mpeglib/example/mpgplay/Makefile.in.orig Fri Oct 7 10:00:42 2005 -+++ mpeglib/example/mpgplay/Makefile.in Sun Oct 16 22:40:18 2005 -@@ -176,7 +176,7 @@ LAME_INCS = @LAME_INCS@ +$OpenBSD: patch-mpeglib_example_mpgplay_Makefile_in,v 1.14 2006/02/16 08:25:11 espie Exp $ +--- mpeglib/example/mpgplay/Makefile.in.orig Fri Jan 20 18:48:35 2006 ++++ mpeglib/example/mpgplay/Makefile.in Wed Feb 15 12:13:03 2006 +@@ -171,7 +171,7 @@ KDE_USE_PIE = @KDE_USE_PIE@ + KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ LAME_LIBS = @LAME_LIBS@ - LAME_RPATH = @LAME_RPATH@ LDADD_GST = @LDADD_GST@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ -L../../lib/.libs LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ LDFLAGS_GST = @LDFLAGS_GST@ LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -@@ -485,7 +485,7 @@ INCLUDES = $(all_includes) +@@ -463,7 +463,7 @@ INCLUDES = $(all_includes) EXTRA_DIST = mpgplay_SOURCES = mpgplay.cpp noinst_HEADERS = diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_splay_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_splay_Makefile_in index e3fc16fb08e..8e4e39eeb89 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_example_splay_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_splay_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-mpeglib_example_splay_Makefile_in,v 1.13 2005/10/17 11:28:25 espie Exp $ ---- mpeglib/example/splay/Makefile.in.orig Fri Oct 7 10:00:42 2005 -+++ mpeglib/example/splay/Makefile.in Sun Oct 16 22:40:18 2005 -@@ -181,7 +181,7 @@ LAME_INCS = @LAME_INCS@ +$OpenBSD: patch-mpeglib_example_splay_Makefile_in,v 1.14 2006/02/16 08:25:11 espie Exp $ +--- mpeglib/example/splay/Makefile.in.orig Fri Jan 20 18:48:35 2006 ++++ mpeglib/example/splay/Makefile.in Wed Feb 15 12:13:03 2006 +@@ -176,7 +176,7 @@ KDE_USE_PIE = @KDE_USE_PIE@ + KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ LAME_LIBS = @LAME_LIBS@ - LAME_RPATH = @LAME_RPATH@ LDADD_GST = @LDADD_GST@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ -L../../lib/.libs LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ LDFLAGS_GST = @LDFLAGS_GST@ LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -@@ -491,11 +491,11 @@ EXTRA_DIST = +@@ -469,11 +469,11 @@ EXTRA_DIST = splay_SOURCES = splay.cpp mp3framing_SOURCES = mp3framing.cpp noinst_HEADERS = diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_tplay_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_tplay_Makefile_in index d5659121b2e..89747b17264 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_example_tplay_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_tplay_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-mpeglib_example_tplay_Makefile_in,v 1.13 2005/10/17 11:28:25 espie Exp $ ---- mpeglib/example/tplay/Makefile.in.orig Fri Oct 7 10:00:42 2005 -+++ mpeglib/example/tplay/Makefile.in Sun Oct 16 22:40:18 2005 -@@ -176,7 +176,7 @@ LAME_INCS = @LAME_INCS@ +$OpenBSD: patch-mpeglib_example_tplay_Makefile_in,v 1.14 2006/02/16 08:25:11 espie Exp $ +--- mpeglib/example/tplay/Makefile.in.orig Fri Jan 20 18:48:35 2006 ++++ mpeglib/example/tplay/Makefile.in Wed Feb 15 12:13:03 2006 +@@ -171,7 +171,7 @@ KDE_USE_PIE = @KDE_USE_PIE@ + KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ LAME_LIBS = @LAME_LIBS@ - LAME_RPATH = @LAME_RPATH@ LDADD_GST = @LDADD_GST@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ -L../../lib/.libs LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ LDFLAGS_GST = @LDFLAGS_GST@ LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -@@ -485,7 +485,7 @@ INCLUDES = -I../../include $(all_include +@@ -463,7 +463,7 @@ INCLUDES = -I../../include $(all_include EXTRA_DIST = tplay_SOURCES = tplay.cpp noinst_HEADERS = diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafcdda_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafcdda_Makefile_in index c89fc484a1a..4622e8849bc 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafcdda_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafcdda_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-mpeglib_example_yaf_yafcdda_Makefile_in,v 1.13 2005/10/17 11:28:25 espie Exp $ ---- mpeglib/example/yaf/yafcdda/Makefile.in.orig Fri Oct 7 10:00:42 2005 -+++ mpeglib/example/yaf/yafcdda/Makefile.in Sun Oct 16 22:40:18 2005 -@@ -180,7 +180,7 @@ LAME_INCS = @LAME_INCS@ +$OpenBSD: patch-mpeglib_example_yaf_yafcdda_Makefile_in,v 1.14 2006/02/16 08:25:11 espie Exp $ +--- mpeglib/example/yaf/yafcdda/Makefile.in.orig Fri Jan 20 18:48:35 2006 ++++ mpeglib/example/yaf/yafcdda/Makefile.in Wed Feb 15 12:13:03 2006 +@@ -175,7 +175,7 @@ KDE_USE_PIE = @KDE_USE_PIE@ + KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ LAME_LIBS = @LAME_LIBS@ - LAME_RPATH = @LAME_RPATH@ LDADD_GST = @LDADD_GST@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ -L../../../lib/.libs LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ LDFLAGS_GST = @LDFLAGS_GST@ LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -@@ -488,7 +488,7 @@ xine_artsplugin_SUBDIR_included_TRUE = @ +@@ -466,7 +466,7 @@ xine_artsplugin_SUBDIR_included_TRUE = @ INCLUDES = -I../../include $(all_includes) yaf_cdda_SOURCES = cdda_control.cpp noinst_HEADERS = diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafcore_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafcore_Makefile_in new file mode 100644 index 00000000000..2f3f40e1a8e --- /dev/null +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafcore_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-mpeglib_example_yaf_yafcore_Makefile_in,v 1.1 2006/02/16 08:25:12 espie Exp $ +--- mpeglib/example/yaf/yafcore/Makefile.in.orig Thu Feb 16 06:14:08 2006 ++++ mpeglib/example/yaf/yafcore/Makefile.in Thu Feb 16 06:14:32 2006 +@@ -504,7 +504,7 @@ libyafcore_la_SOURCES = buffer.cpp \ + #>- -no-undefined -avoid-version + #>+ 2 + libyafcore_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) \ +- -no-undefined $(KDE_NO_UNDEFINED) -avoid-version ++ -no-undefined $(KDE_NO_UNDEFINED) + + libyafcore_la_LIBADD = -lkdefakes $(THIS_LIB_LIBS) + yafcoredir = $(includedir)/$(THIS_LIB_NAME)/util/yaf/yafcore diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafmpgplay_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafmpgplay_Makefile_in index dd1773bab7e..d6b068f766b 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafmpgplay_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafmpgplay_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-mpeglib_example_yaf_yafmpgplay_Makefile_in,v 1.13 2005/10/17 11:28:25 espie Exp $ ---- mpeglib/example/yaf/yafmpgplay/Makefile.in.orig Fri Oct 7 10:00:42 2005 -+++ mpeglib/example/yaf/yafmpgplay/Makefile.in Sun Oct 16 22:40:18 2005 -@@ -180,7 +180,7 @@ LAME_INCS = @LAME_INCS@ +$OpenBSD: patch-mpeglib_example_yaf_yafmpgplay_Makefile_in,v 1.14 2006/02/16 08:25:12 espie Exp $ +--- mpeglib/example/yaf/yafmpgplay/Makefile.in.orig Fri Jan 20 18:48:35 2006 ++++ mpeglib/example/yaf/yafmpgplay/Makefile.in Wed Feb 15 12:13:03 2006 +@@ -175,7 +175,7 @@ KDE_USE_PIE = @KDE_USE_PIE@ + KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ LAME_LIBS = @LAME_LIBS@ - LAME_RPATH = @LAME_RPATH@ LDADD_GST = @LDADD_GST@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ -L../../../lib/.libs LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ LDFLAGS_GST = @LDFLAGS_GST@ LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -@@ -489,7 +489,7 @@ INCLUDES = -I../../include $(all_include +@@ -467,7 +467,7 @@ INCLUDES = -I../../include $(all_include EXTRA_DIST = stresstest yaf_mpgplay_SOURCES = mpg_control.cpp noinst_HEADERS = diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafsplay_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafsplay_Makefile_in index baa93721deb..02bb41b93ea 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafsplay_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafsplay_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-mpeglib_example_yaf_yafsplay_Makefile_in,v 1.13 2005/10/17 11:28:26 espie Exp $ ---- mpeglib/example/yaf/yafsplay/Makefile.in.orig Fri Oct 7 10:00:42 2005 -+++ mpeglib/example/yaf/yafsplay/Makefile.in Sun Oct 16 22:40:18 2005 -@@ -180,7 +180,7 @@ LAME_INCS = @LAME_INCS@ +$OpenBSD: patch-mpeglib_example_yaf_yafsplay_Makefile_in,v 1.14 2006/02/16 08:25:12 espie Exp $ +--- mpeglib/example/yaf/yafsplay/Makefile.in.orig Fri Jan 20 18:48:35 2006 ++++ mpeglib/example/yaf/yafsplay/Makefile.in Wed Feb 15 12:13:03 2006 +@@ -175,7 +175,7 @@ KDE_USE_PIE = @KDE_USE_PIE@ + KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ LAME_LIBS = @LAME_LIBS@ - LAME_RPATH = @LAME_RPATH@ LDADD_GST = @LDADD_GST@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ -L../../../lib/.libs LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ LDFLAGS_GST = @LDFLAGS_GST@ LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -@@ -489,7 +489,7 @@ INCLUDES = -I../../include $(all_include +@@ -467,7 +467,7 @@ INCLUDES = -I../../include $(all_include EXTRA_DIST = stresstest yaf_splay_SOURCES = splay_control.cpp noinst_HEADERS = diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yaftplay_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yaftplay_Makefile_in index 510f98e84f6..eeb5abedf9b 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yaftplay_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yaftplay_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-mpeglib_example_yaf_yaftplay_Makefile_in,v 1.13 2005/10/17 11:28:26 espie Exp $ ---- mpeglib/example/yaf/yaftplay/Makefile.in.orig Fri Oct 7 10:00:42 2005 -+++ mpeglib/example/yaf/yaftplay/Makefile.in Sun Oct 16 22:40:18 2005 -@@ -180,7 +180,7 @@ LAME_INCS = @LAME_INCS@ +$OpenBSD: patch-mpeglib_example_yaf_yaftplay_Makefile_in,v 1.14 2006/02/16 08:25:12 espie Exp $ +--- mpeglib/example/yaf/yaftplay/Makefile.in.orig Fri Jan 20 18:48:35 2006 ++++ mpeglib/example/yaf/yaftplay/Makefile.in Wed Feb 15 12:13:03 2006 +@@ -175,7 +175,7 @@ KDE_USE_PIE = @KDE_USE_PIE@ + KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ LAME_LIBS = @LAME_LIBS@ - LAME_RPATH = @LAME_RPATH@ LDADD_GST = @LDADD_GST@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ -L../../../lib/.libs LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ LDFLAGS_GST = @LDFLAGS_GST@ LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -@@ -488,7 +488,7 @@ xine_artsplugin_SUBDIR_included_TRUE = @ +@@ -466,7 +466,7 @@ xine_artsplugin_SUBDIR_included_TRUE = @ INCLUDES = -I../../include $(all_includes) yaf_tplay_SOURCES = tplay_control.cpp noinst_HEADERS = diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafvorbis_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafvorbis_Makefile_in index cf1f88d6447..a6e7b0f71be 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafvorbis_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafvorbis_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-mpeglib_example_yaf_yafvorbis_Makefile_in,v 1.13 2005/10/17 11:28:26 espie Exp $ ---- mpeglib/example/yaf/yafvorbis/Makefile.in.orig Fri Oct 7 10:00:42 2005 -+++ mpeglib/example/yaf/yafvorbis/Makefile.in Sun Oct 16 22:40:18 2005 -@@ -180,7 +180,7 @@ LAME_INCS = @LAME_INCS@ +$OpenBSD: patch-mpeglib_example_yaf_yafvorbis_Makefile_in,v 1.14 2006/02/16 08:25:12 espie Exp $ +--- mpeglib/example/yaf/yafvorbis/Makefile.in.orig Fri Jan 20 18:48:35 2006 ++++ mpeglib/example/yaf/yafvorbis/Makefile.in Wed Feb 15 12:13:03 2006 +@@ -175,7 +175,7 @@ KDE_USE_PIE = @KDE_USE_PIE@ + KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ LAME_LIBS = @LAME_LIBS@ - LAME_RPATH = @LAME_RPATH@ LDADD_GST = @LDADD_GST@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ -L../../../lib/.libs LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ LDFLAGS_GST = @LDFLAGS_GST@ LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -@@ -489,7 +489,7 @@ INCLUDES = -I../../include -I../../inclu +@@ -467,7 +467,7 @@ INCLUDES = -I../../include -I../../inclu EXTRA_DIST = yaf_vorbis_SOURCES = vorbis_control.cpp noinst_HEADERS = diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafxplayer_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafxplayer_Makefile_in new file mode 100644 index 00000000000..a0ca9ffbbe2 --- /dev/null +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafxplayer_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-mpeglib_example_yaf_yafxplayer_Makefile_in,v 1.8 2006/02/16 08:25:12 espie Exp $ +--- mpeglib/example/yaf/yafxplayer/Makefile.in.orig Thu Feb 16 06:14:51 2006 ++++ mpeglib/example/yaf/yafxplayer/Makefile.in Thu Feb 16 06:15:00 2006 +@@ -492,7 +492,7 @@ libyafxplayer_la_SOURCES = commandTableX + #>- -no-undefined -avoid-version + #>+ 2 + libyafxplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) \ +- -no-undefined $(KDE_NO_UNDEFINED) -avoid-version ++ -no-undefined $(KDE_NO_UNDEFINED) + + libyafxplayer_la_LIBADD = ../../../lib/libmpeg.la \ + ../yafcore/libyafcore.la \ diff --git a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafyuv_Makefile_in b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafyuv_Makefile_in index 1c3b8e09bc9..2b19a228dd7 100644 --- a/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafyuv_Makefile_in +++ b/x11/kde/multimedia3/patches/patch-mpeglib_example_yaf_yafyuv_Makefile_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-mpeglib_example_yaf_yafyuv_Makefile_in,v 1.13 2005/10/17 11:28:26 espie Exp $ ---- mpeglib/example/yaf/yafyuv/Makefile.in.orig Fri Oct 7 10:00:42 2005 -+++ mpeglib/example/yaf/yafyuv/Makefile.in Sun Oct 16 22:40:18 2005 -@@ -180,7 +180,7 @@ LAME_INCS = @LAME_INCS@ +$OpenBSD: patch-mpeglib_example_yaf_yafyuv_Makefile_in,v 1.14 2006/02/16 08:25:12 espie Exp $ +--- mpeglib/example/yaf/yafyuv/Makefile.in.orig Fri Jan 20 18:48:35 2006 ++++ mpeglib/example/yaf/yafyuv/Makefile.in Wed Feb 15 12:13:03 2006 +@@ -175,7 +175,7 @@ KDE_USE_PIE = @KDE_USE_PIE@ + KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ LAME_LIBS = @LAME_LIBS@ - LAME_RPATH = @LAME_RPATH@ LDADD_GST = @LDADD_GST@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ -L../../../lib/.libs LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ LDFLAGS_GST = @LDFLAGS_GST@ LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -@@ -489,7 +489,7 @@ INCLUDES = -I../../include $(all_include +@@ -467,7 +467,7 @@ INCLUDES = -I../../include $(all_include EXTRA_DIST = yaf_yuv_SOURCES = yuv_control.cpp noinst_HEADERS = diff --git a/x11/kde/multimedia3/pkg/PLIST b/x11/kde/multimedia3/pkg/PLIST index 0f90b147a5e..82d1417cfd5 100644 --- a/x11/kde/multimedia3/pkg/PLIST +++ b/x11/kde/multimedia3/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.21 2006/01/08 16:03:28 espie Exp $ +@comment $OpenBSD: PLIST,v 1.22 2006/02/16 08:25:12 espie Exp $ bin/artsbuilder bin/artscontrol bin/juk @@ -19,31 +19,6 @@ bin/yaf-splay bin/yaf-tplay bin/yaf-vorbis bin/yaf-yuv -include/akode/ -include/akode/akodelib.h -include/akode/audiobuffer.h -include/akode/audioconfiguration.h -include/akode/audioframe.h -include/akode/auto_sink.h -include/akode/converter.h -include/akode/crossfader.h -include/akode/decoder.h -include/akode/encoder.h -include/akode/fast_resampler.h -include/akode/file.h -include/akode/framedecoder.h -include/akode/frametostream_decoder.h -include/akode/localfile.h -include/akode/magic.h -include/akode/mmapfile.h -include/akode/player.h -include/akode/pluginhandler.h -include/akode/resampler.h -include/akode/sink.h -include/akode/streamdecoder.h -include/akode/streamtoframe_decoder.h -include/akode/volumefilter.h -include/akode/wav_decoder.h include/arts/artsbuilder.h include/arts/artsbuilder.idl include/arts/artsgui.h @@ -217,6 +192,8 @@ ${KDE}/kfile_mp3.la ${KDE}/kfile_mp3.so ${KDE}/kfile_mpc.la ${KDE}/kfile_mpc.so +${KDE}/kfile_mpeg.la +${KDE}/kfile_mpeg.so ${KDE}/kfile_ogg.la ${KDE}/kfile_ogg.so ${KDE}/kfile_sid.la @@ -287,18 +264,6 @@ ${KDE}/noatun_winskin.la ${KDE}/noatun_winskin.so ${KDE}/noatunsimple.la ${KDE}/noatunsimple.so -lib/libakode.la -@lib lib/libakode.so.${LIBakode_VERSION} -lib/libakode_mpc_decoder.la -lib/libakode_mpc_decoder.so -lib/libakode_mpeg_decoder.la -lib/libakode_mpeg_decoder.so -lib/libakode_oss_sink.la -lib/libakode_oss_sink.so -lib/libakode_xiph_decoder.la -lib/libakode_xiph_decoder.so -lib/libarts_akode.la -lib/libarts_akode.so @lib lib/libarts_mpeglib-0.3.0.so.${LIBarts_mpeglib-0.3.0_VERSION} lib/libarts_mpeglib.la @lib lib/libarts_mpeglib.so.${LIBarts_mpeglib_VERSION} @@ -475,14 +440,6 @@ lib/mcop/RawWriter.mcopclass lib/mcop/SplayPlayObject.mcopclass lib/mcop/VoiceRemoval.mcopclass lib/mcop/WAVPlayObject.mcopclass -lib/mcop/akodeMPCPlayObject.mcopclass -lib/mcop/akodeMPEGPlayObject.mcopclass -lib/mcop/akodePlayObject.mcopclass -lib/mcop/akodeSpeexStreamPlayObject.mcopclass -lib/mcop/akodeVorbisStreamPlayObject.mcopclass -lib/mcop/akodeXiphPlayObject.mcopclass -lib/mcop/akodearts.mcopclass -lib/mcop/akodearts.mcoptype lib/mcop/artsbuilder.mcopclass lib/mcop/artsbuilder.mcoptype lib/mcop/artseffects.mcopclass @@ -620,6 +577,7 @@ share/apps/juk/jukui-rtl.rc share/apps/juk/jukui.rc share/apps/juk/pics/ share/apps/juk/pics/playing.png +share/apps/juk/pics/splash.png share/apps/kaboodle/ share/apps/kaboodle/icons/ share/apps/kaboodle/icons/crystalsvg/ @@ -736,6 +694,7 @@ share/apps/kmix/pics/mix_video.png share/apps/kmix/pics/mix_volume.png share/apps/konqueror/ share/apps/konqueror/servicemenus/ +share/apps/konqueror/servicemenus/audiocd_extract.desktop share/apps/konqueror/servicemenus/audiocd_play.desktop share/apps/konqueror/servicemenus/jukservicemenu.desktop share/apps/krec/ @@ -1128,13 +1087,11 @@ share/doc/HTML/en/kaboodle/ share/doc/HTML/en/kaboodle/common share/doc/HTML/en/kaboodle/index.cache.bz2 share/doc/HTML/en/kaboodle/index.docbook -share/doc/HTML/en/kcontrol/ -share/doc/HTML/en/kcontrol/kmixcfg/ -share/doc/HTML/en/kcontrol/kmixcfg/common -share/doc/HTML/en/kcontrol/kmixcfg/index.cache.bz2 -share/doc/HTML/en/kcontrol/kmixcfg/index.docbook -share/doc/HTML/en/kio_audiocd/ -share/doc/HTML/en/kio_audiocd/audiocd.docbook +share/doc/HTML/en/kdemultimedia-apidocs/ +share/doc/HTML/en/kdemultimedia-apidocs/libkcddb/ +share/doc/HTML/en/kdemultimedia-apidocs/libkcddb/html/ +share/doc/HTML/en/kioslave/ +share/doc/HTML/en/kioslave/audiocd.docbook share/doc/HTML/en/kmid/ share/doc/HTML/en/kmid/common share/doc/HTML/en/kmid/index.cache.bz2 @@ -1181,29 +1138,12 @@ share/icons/crystalsvg/128x128/actions/artsenvironment.png share/icons/crystalsvg/128x128/actions/artsfftscope.png share/icons/crystalsvg/128x128/actions/artsmediatypes.png share/icons/crystalsvg/128x128/actions/artsmidimanager.png -share/icons/crystalsvg/128x128/apps/artscontrol.png -share/icons/crystalsvg/128x128/apps/juk.png -share/icons/crystalsvg/128x128/apps/kaboodle.png -share/icons/crystalsvg/128x128/apps/kmix.png -share/icons/crystalsvg/128x128/apps/krec.png -share/icons/crystalsvg/128x128/apps/kscd.png -share/icons/crystalsvg/128x128/apps/noatun.png share/icons/crystalsvg/16x16/actions/artsaudiomanager.png share/icons/crystalsvg/16x16/actions/artsbuilderexecute.png share/icons/crystalsvg/16x16/actions/artsenvironment.png share/icons/crystalsvg/16x16/actions/artsfftscope.png share/icons/crystalsvg/16x16/actions/artsmediatypes.png share/icons/crystalsvg/16x16/actions/artsmidimanager.png -share/icons/crystalsvg/16x16/apps/artsbuilder.png -share/icons/crystalsvg/16x16/apps/artscontrol.png -share/icons/crystalsvg/16x16/apps/juk.png -share/icons/crystalsvg/16x16/apps/kaboodle.png -share/icons/crystalsvg/16x16/apps/kaudiocreator.png -share/icons/crystalsvg/16x16/apps/kmid.png -share/icons/crystalsvg/16x16/apps/kmix.png -share/icons/crystalsvg/16x16/apps/krec.png -share/icons/crystalsvg/16x16/apps/kscd.png -share/icons/crystalsvg/16x16/apps/noatun.png share/icons/crystalsvg/22x22/actions/artsaudiomanager.png share/icons/crystalsvg/22x22/actions/artsbuilderexecute.png share/icons/crystalsvg/22x22/actions/artsenvironment.png @@ -1211,56 +1151,87 @@ share/icons/crystalsvg/22x22/actions/artsfftscope.png share/icons/crystalsvg/22x22/actions/artsmediatypes.png share/icons/crystalsvg/22x22/actions/artsmidimanager.png share/icons/crystalsvg/22x22/actions/juk_dock.png -share/icons/crystalsvg/22x22/apps/artscontrol.png -share/icons/crystalsvg/22x22/apps/kaboodle.png -share/icons/crystalsvg/22x22/apps/krec.png -share/icons/crystalsvg/22x22/apps/noatun.png share/icons/crystalsvg/32x32/actions/artsaudiomanager.png share/icons/crystalsvg/32x32/actions/artsenvironment.png share/icons/crystalsvg/32x32/actions/artsfftscope.png share/icons/crystalsvg/32x32/actions/artsmediatypes.png share/icons/crystalsvg/32x32/actions/artsmidimanager.png -share/icons/crystalsvg/32x32/apps/artscontrol.png -share/icons/crystalsvg/32x32/apps/juk.png -share/icons/crystalsvg/32x32/apps/kaboodle.png -share/icons/crystalsvg/32x32/apps/kaudiocreator.png -share/icons/crystalsvg/32x32/apps/kmid.png -share/icons/crystalsvg/32x32/apps/kmix.png -share/icons/crystalsvg/32x32/apps/krec.png -share/icons/crystalsvg/32x32/apps/kscd.png -share/icons/crystalsvg/32x32/apps/noatun.png share/icons/crystalsvg/48x48/actions/artsaudiomanager.png share/icons/crystalsvg/48x48/actions/artsenvironment.png share/icons/crystalsvg/48x48/actions/artsfftscope.png share/icons/crystalsvg/48x48/actions/artsmediatypes.png share/icons/crystalsvg/48x48/actions/artsmidimanager.png -share/icons/crystalsvg/48x48/apps/artscontrol.png -share/icons/crystalsvg/48x48/apps/juk.png -share/icons/crystalsvg/48x48/apps/kaboodle.png -share/icons/crystalsvg/48x48/apps/kmid.png -share/icons/crystalsvg/48x48/apps/kmix.png -share/icons/crystalsvg/48x48/apps/krec.png -share/icons/crystalsvg/48x48/apps/kscd.png -share/icons/crystalsvg/48x48/apps/noatun.png share/icons/crystalsvg/64x64/actions/artsaudiomanager.png share/icons/crystalsvg/64x64/actions/artsenvironment.png share/icons/crystalsvg/64x64/actions/artsfftscope.png share/icons/crystalsvg/64x64/actions/artsmediatypes.png share/icons/crystalsvg/64x64/actions/artsmidimanager.png -share/icons/crystalsvg/64x64/apps/artscontrol.png -share/icons/crystalsvg/64x64/apps/juk.png -share/icons/crystalsvg/64x64/apps/kaboodle.png -share/icons/crystalsvg/64x64/apps/kmix.png -share/icons/crystalsvg/64x64/apps/krec.png -share/icons/crystalsvg/64x64/apps/kscd.png -share/icons/crystalsvg/64x64/apps/noatun.png -share/icons/crystalsvg/scalable/actions/artsaudiomanager.svg -share/icons/crystalsvg/scalable/actions/artsenvironment.svg -share/icons/crystalsvg/scalable/actions/artsfftscope.svg -share/icons/crystalsvg/scalable/actions/artsmediatypes.svg -share/icons/crystalsvg/scalable/actions/artsmidimanager.svg -share/icons/crystalsvg/scalable/apps/artsbuilder.svgz -share/icons/crystalsvg/scalable/apps/artscontrol.svg +share/icons/crystalsvg/scalable/actions/artsaudiomanager.svgz +share/icons/crystalsvg/scalable/actions/artsenvironment.svgz +share/icons/crystalsvg/scalable/actions/artsfftscope.svgz +share/icons/crystalsvg/scalable/actions/artsmediatypes.svgz +share/icons/crystalsvg/scalable/actions/artsmidimanager.svgz +share/icons/hicolor/128x128/ +share/icons/hicolor/128x128/apps/ +share/icons/hicolor/128x128/apps/artscontrol.png +share/icons/hicolor/128x128/apps/juk.png +share/icons/hicolor/128x128/apps/kaboodle.png +share/icons/hicolor/128x128/apps/kmix.png +share/icons/hicolor/128x128/apps/krec.png +share/icons/hicolor/128x128/apps/kscd.png +share/icons/hicolor/128x128/apps/noatun.png +share/icons/hicolor/16x16/ +share/icons/hicolor/16x16/apps/ +share/icons/hicolor/16x16/apps/artsbuilder.png +share/icons/hicolor/16x16/apps/artscontrol.png +share/icons/hicolor/16x16/apps/juk.png +share/icons/hicolor/16x16/apps/kaboodle.png +share/icons/hicolor/16x16/apps/kaudiocreator.png +share/icons/hicolor/16x16/apps/kmid.png +share/icons/hicolor/16x16/apps/kmix.png +share/icons/hicolor/16x16/apps/krec.png +share/icons/hicolor/16x16/apps/kscd.png +share/icons/hicolor/16x16/apps/noatun.png +share/icons/hicolor/22x22/ +share/icons/hicolor/22x22/apps/ +share/icons/hicolor/22x22/apps/artscontrol.png +share/icons/hicolor/22x22/apps/kaboodle.png +share/icons/hicolor/22x22/apps/krec.png +share/icons/hicolor/22x22/apps/noatun.png +share/icons/hicolor/32x32/ +share/icons/hicolor/32x32/apps/ +share/icons/hicolor/32x32/apps/artscontrol.png +share/icons/hicolor/32x32/apps/juk.png +share/icons/hicolor/32x32/apps/kaboodle.png +share/icons/hicolor/32x32/apps/kaudiocreator.png +share/icons/hicolor/32x32/apps/kmid.png +share/icons/hicolor/32x32/apps/kmix.png +share/icons/hicolor/32x32/apps/krec.png +share/icons/hicolor/32x32/apps/kscd.png +share/icons/hicolor/32x32/apps/noatun.png +share/icons/hicolor/48x48/ +share/icons/hicolor/48x48/apps/ +share/icons/hicolor/48x48/apps/artscontrol.png +share/icons/hicolor/48x48/apps/juk.png +share/icons/hicolor/48x48/apps/kaboodle.png +share/icons/hicolor/48x48/apps/kmid.png +share/icons/hicolor/48x48/apps/kmix.png +share/icons/hicolor/48x48/apps/krec.png +share/icons/hicolor/48x48/apps/kscd.png +share/icons/hicolor/48x48/apps/noatun.png +share/icons/hicolor/64x64/ +share/icons/hicolor/64x64/apps/ +share/icons/hicolor/64x64/apps/artscontrol.png +share/icons/hicolor/64x64/apps/juk.png +share/icons/hicolor/64x64/apps/kaboodle.png +share/icons/hicolor/64x64/apps/kmix.png +share/icons/hicolor/64x64/apps/krec.png +share/icons/hicolor/64x64/apps/kscd.png +share/icons/hicolor/64x64/apps/noatun.png +share/icons/hicolor/scalable/ +share/icons/hicolor/scalable/apps/ +share/icons/hicolor/scalable/apps/artsbuilder.svgz +share/icons/hicolor/scalable/apps/artscontrol.svgz share/icons/locolor/ share/icons/locolor/16x16/ share/icons/locolor/16x16/apps/ @@ -1284,6 +1255,7 @@ share/services/kfile_flac.desktop share/services/kfile_m3u.desktop share/services/kfile_mp3.desktop share/services/kfile_mpc.desktop +share/services/kfile_mpeg.desktop share/services/kfile_ogg.desktop share/services/kfile_sid.desktop share/services/kfile_theora.desktop