head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.52 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.50 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.48 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.46 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.44 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.42 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.40 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.38 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.36 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.34 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.32 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.30 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.28 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.26 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.24 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.22 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.20 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.18 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.16 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.14 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.12 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.10 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.8 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.6 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.4 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.2 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.1.1.1.0.4 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.1.1.0.6 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.1.1.0.8 pkgviews-base:1.1 buildlink2-base:1.1.1.1 buildlink2:1.1.1.1.0.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2004.01.26.15.45.21; author jmmv; state dead; branches; next 1.3; 1.3 date 2003.05.22.03.05.40; author markd; state Exp; branches; next 1.2; 1.2 date 2003.03.11.13.33.49; author markd; state Exp; branches; next 1.1; 1.1 date 2002.05.31.14.46.48; author skrll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.14.46.48; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.14.46.48; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.18.38.07; author jlam; state Exp; branches; next ; desc @@ 1.4 log @kdemultimedia[23] moved to the multimedia category. @ text @$NetBSD: patch-aj,v 1.3 2003/05/22 03:05:40 markd Exp $ --- kmix/Makefile.am.orig Wed May 7 23:46:50 2003 +++ kmix/Makefile.am @@@@ -2,7 +2,7 @@@@ SUBDIRS = control pics INCLUDES= $(all_includes) bin_PROGRAMS = kmix kmixctrl -lib_LTLIBRARIES = kmix.la kmixctrl.la +lib_LTLIBRARIES = libkmix_main.la kmix.la libkmixctrl_main.la kmixctrl.la kde_module_LTLIBRARIES = kmix_panelapplet.la @@@@ -12,22 +12,30 @@@@ noinst_HEADERS = kmix.h kmixdockwidget.h METASOURCES = AUTO -kmix_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ +libkmix_main_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp VerticalText.cpp \ volume.cpp kledbutton.cpp mixdevicewidget.cpp mixerIface.skel -kmix_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) +libkmix_main_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) +libkmix_main_la_LDFLAGS = $(all_libraries) + +kmix_la_SOURCES = kmix_main.cpp +kmix_la_LIBADD = libkmix_main.la kmix_la_LDFLAGS = $(all_libraries) -module -avoid-version -kmix_SOURCES = dummy.cpp -kmix_LDADD = kmix.la +kmix_SOURCES = kmix_main.cpp +kmix_LDADD = libkmix_main.la kmix_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kmixctrl_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp mixerIface.skel -kmixctrl_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) +libkmixctrl_main_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp mixerIface.skel +libkmixctrl_main_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) +libkmixctrl_main_la_LDFLAGS = $(all_libraries) + +kmixctrl_la_SOURCES = kmixctrl_main.cpp +kmixctrl_la_LIBADD = libkmixctrl_main.la kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version -kmixctrl_SOURCES = dummy.cpp -kmixctrl_LDADD = kmixctrl.la +kmixctrl_SOURCES = kmixctrl_main.cpp +kmixctrl_LDADD = libkmixctrl_main.la kmixctrl_LDFLAGS = $(all_libraries) $(KDE_RPATH) kmix_panelapplet_la_SOURCES = kmixapplet.cpp kmixerwidget.cpp channel.cpp \ @@@@ -57,6 +65,3 @@@@ services_DATA = kmixctrl_restore.desktop messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kmix.pot - -dummy.cpp: - echo > dummy.cpp @ 1.3 log @Update KDE to 3.1.2. Changes: kdemultimedia: * Ogg Vorbis Info List view column titles were incorrect. * kmix: Vertical label widget to sliders in replacement of large horizontal labels * kmix: Fixed alsa 0.9x to restore current volumes * kmix: Fixed multiple alsa 0.9x cards detection @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update KDE to 3.1. Many bugfixes and functionality enhancements including: kdemultimedia Started a video framework More consistent internationalisation in many applications. NEW IN KDE: KAudioCreator, a CD ripper and audio encoder frontend. NEW IN KDE: KRec, an audio recorder using aRts. KMediaPlayer interface added to kdelibs to reuse Kaboodle. Noatun: Added option to clear the playlist when running with a file as command line option. Added video thumbnail creator using xine-arts. KMix: Added mute control support. @ text @d3 1 a3 1 --- kmix/Makefile.am.orig Sun Oct 27 11:20:17 2002 d20 1 a20 1 kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp \ @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- kmix/Makefile.am.orig Wed May 8 19:29:16 2002 d5 1 a5 1 @@@@ -2,7 +2,7 @@@@ d14 1 a14 1 @@@@ -12,22 +12,30 @@@@ d21 1 a21 1 volume.cpp kledbutton.cpp mixdevicewidget.cpp d36 1 a36 7 -kmixctrl_SOURCES = dummy.cpp -kmixctrl_LDADD = kmixctrl.la +kmixctrl_SOURCES = kmixctrl_main.cpp +kmixctrl_LDADD = libkmixctrl_main.la kmixctrl_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kmixctrl_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp d38 1 a38 1 +libkmixctrl_main_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp d46 8 a53 2 kmix_panelapplet_la_METASOURCES=AUTO @@@@ -58,6 +66,3 @@@@ @ 1.1.1.1 log @Initial import of a kdemultimedia3 pkg. @ text @@ 1.1.1.1.2.1 log @file patch-aj was added on branch buildlink2 on 2002-06-23 18:38:07 +0000 @ text @d1 59 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 59 $NetBSD: patch-aj,v 1.1.1.1.2.1 2002/06/23 18:38:07 jlam Exp $ --- kmix/Makefile.am.orig Wed May 8 19:29:16 2002 +++ kmix/Makefile.am @@@@ -2,7 +2,7 @@@@ INCLUDES= $(all_includes) bin_PROGRAMS = kmix kmixctrl -lib_LTLIBRARIES = kmix.la kmixctrl.la +lib_LTLIBRARIES = libkmix_main.la kmix.la libkmixctrl_main.la kmixctrl.la kde_module_LTLIBRARIES = kmix_panelapplet.la @@@@ -12,22 +12,30 @@@@ METASOURCES = AUTO -kmix_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ +libkmix_main_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp \ volume.cpp kledbutton.cpp mixdevicewidget.cpp -kmix_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) +libkmix_main_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) +libkmix_main_la_LDFLAGS = $(all_libraries) + +kmix_la_SOURCES = kmix_main.cpp +kmix_la_LIBADD = libkmix_main.la kmix_la_LDFLAGS = $(all_libraries) -module -avoid-version -kmix_SOURCES = dummy.cpp -kmix_LDADD = kmix.la +kmix_SOURCES = kmix_main.cpp +kmix_LDADD = libkmix_main.la kmix_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kmixctrl_SOURCES = dummy.cpp -kmixctrl_LDADD = kmixctrl.la +kmixctrl_SOURCES = kmixctrl_main.cpp +kmixctrl_LDADD = libkmixctrl_main.la kmixctrl_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kmixctrl_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp -kmixctrl_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) +libkmixctrl_main_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp +libkmixctrl_main_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) +libkmixctrl_main_la_LDFLAGS = $(all_libraries) + +kmixctrl_la_SOURCES = kmixctrl_main.cpp +kmixctrl_la_LIBADD = libkmixctrl_main.la kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version kmix_panelapplet_la_METASOURCES=AUTO @@@@ -58,6 +66,3 @@@@ messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kmix.pot - -dummy.cpp: - echo > dummy.cpp @