diff options
author | jlam <jlam> | 2001-11-13 21:11:54 +0000 |
---|---|---|
committer | jlam <jlam> | 2001-11-13 21:11:54 +0000 |
commit | 43317db047c2fd6c2055a3a266743274d33c2c5f (patch) | |
tree | 4a7f98704cb461e5a7c5784532f0a6a60f1e20c6 /audio | |
parent | 9ba3b87d244a2fd2f626557f686e8cd5bb41b8f7 (diff) | |
download | pkgsrc-43317db047c2fd6c2055a3a266743274d33c2c5f.tar.gz |
* Strongly buildlinkify.
* Use qt2-designer-kde for a uic that understands KDE2 widgets.
* Build and install kmid.
* Check that certain X11 libraries are shared libraries before linking
shared objects against them.
* Fix and sort PLIST.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/kdemultimedia2/Makefile | 25 | ||||
-rw-r--r-- | audio/kdemultimedia2/PLIST | 45 | ||||
-rw-r--r-- | audio/kdemultimedia2/distinfo | 5 | ||||
-rw-r--r-- | audio/kdemultimedia2/patches/patch-aa | 127 | ||||
-rw-r--r-- | audio/kdemultimedia2/patches/patch-ar | 16 |
5 files changed, 200 insertions, 18 deletions
diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile index a7e9a68a582..ffbbbe11f10 100644 --- a/audio/kdemultimedia2/Makefile +++ b/audio/kdemultimedia2/Makefile @@ -1,15 +1,26 @@ -# $NetBSD: Makefile,v 1.6 2001/10/15 22:45:55 skrll Exp $ +# $NetBSD: Makefile,v 1.7 2001/11/13 21:11:54 jlam Exp $ DISTNAME= kdemultimedia-2.2.1 -CATEGORIES= audio kde -.include "../../x11/kde2/Makefile.part1" +CATEGORIES= audio COMMENT= KDE audio tools -DEPENDS+= kdebase>=2.2.1:../../x11/kdebase2 -DEPENDS+= pth>=1.4.0:../../devel/pth +.include "../../x11/kde2/Makefile.kde2" -.include "../../x11/kde2/Makefile.part2" +BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde -LIBS= -Wl,--export-dynamic +BUILDLINK_DEPENDS.pth= pth>=1.4.0 +USE_BUILDLINK_ONLY= YES +CONFIGURE_ENV+= ac_cv_path_kde_artsplug_compiles="${ARTSCCONFIG}" + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "NetBSD" +LIBS= -Wl,--export-dynamic +.endif + +.include "../../devel/pth/buildlink.mk" +.include "../../x11/kde2/buildlink.mk" +.include "../../x11/kdebase2/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/kdemultimedia2/PLIST b/audio/kdemultimedia2/PLIST index 7a660dd7521..c1cabbfbedb 100644 --- a/audio/kdemultimedia2/PLIST +++ b/audio/kdemultimedia2/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:16:56 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2001/11/13 21:11:54 jlam Exp $ bin/aktion bin/artsbuilder bin/artscontrol +bin/kmid bin/kmidi bin/kmix bin/kmixctrl @@ -468,6 +469,7 @@ share/doc/kde/HTML/en/noatun/index.docbook share/kde/applnk/Multimedia/aktion.desktop share/kde/applnk/Multimedia/artsbuilder.desktop share/kde/applnk/Multimedia/artscontrol.desktop +share/kde/applnk/Multimedia/kmid.desktop share/kde/applnk/Multimedia/kmidi.desktop share/kde/applnk/Multimedia/kmix.desktop share/kde/applnk/Multimedia/kscd.desktop @@ -577,6 +579,29 @@ share/kde/apps/artsbuilder/pics/Synth_XFADE.xpm share/kde/apps/artscontrol/artscontrol.rc share/kde/apps/artscontrol/artsmidimanagerview.rc share/kde/apps/kicker/applets/kmixapplet.desktop +share/kde/apps/kmid/DiesIrae.kar +share/kde/apps/kmid/Guantanamera.kar +share/kde/apps/kmid/MariaDeLasMercedes.kar +share/kde/apps/kmid/OFortuna.kar +share/kde/apps/kmid/fm/drums.o3 +share/kde/apps/kmid/fm/drums.sb +share/kde/apps/kmid/fm/std.o3 +share/kde/apps/kmid/fm/std.sb +share/kde/apps/kmid/icons/button1.xpm +share/kde/apps/kmid/icons/button2.xpm +share/kde/apps/kmid/icons/hicolor/16x16/actions/piano.png +share/kde/apps/kmid/icons/hicolor/16x16/actions/volume.png +share/kde/apps/kmid/icons/hicolor/22x22/actions/piano.png +share/kde/apps/kmid/icons/hicolor/22x22/actions/volume.png +share/kde/apps/kmid/icons/hicolor/32x32/actions/piano.png +share/kde/apps/kmid/icons/hicolor/32x32/actions/volume.png +share/kde/apps/kmid/icons/keyboard.xpm +share/kde/apps/kmid/kmid_partui.rc +share/kde/apps/kmid/kmidui.rc +share/kde/apps/kmid/maps/YamahaPSR500.map +share/kde/apps/kmid/maps/YamahaPSS790.map +share/kde/apps/kmid/maps/YamahaQY10.map +share/kde/apps/kmid/maps/gm.map share/kde/apps/kmidi/Axel_Elf.mid share/kde/apps/kmidi/Cavatina.mid share/kde/apps/kmidi/Georgia.mid @@ -858,25 +883,32 @@ share/kde/config/aktionrc share/kde/icons/hicolor/16x16/apps/aktion.png share/kde/icons/hicolor/16x16/apps/artsbuilder.png share/kde/icons/hicolor/16x16/apps/artscontrol.png +share/kde/icons/hicolor/16x16/apps/kmid.png share/kde/icons/hicolor/16x16/apps/kmidi.png share/kde/icons/hicolor/16x16/apps/kmix.png share/kde/icons/hicolor/16x16/apps/kscd.png share/kde/icons/hicolor/16x16/apps/noatun.png share/kde/icons/hicolor/22x22/apps/noatun.png share/kde/icons/hicolor/32x32/apps/aktion.png +share/kde/icons/hicolor/32x32/apps/kmid.png share/kde/icons/hicolor/32x32/apps/kmidi.png share/kde/icons/hicolor/32x32/apps/kmix.png share/kde/icons/hicolor/32x32/apps/kscd.png share/kde/icons/hicolor/32x32/apps/noatun.png +share/kde/icons/hicolor/48x48/apps/kmid.png share/kde/icons/hicolor/48x48/apps/kmidi.png share/kde/icons/hicolor/48x48/apps/kmix.png share/kde/icons/hicolor/48x48/apps/kscd.png share/kde/icons/hicolor/48x48/apps/noatun.png share/kde/mimelnk/application/x-artsbuilder.desktop +share/kde/mimelnk/audio/x-karaoke.desktop share/kde/mimelnk/text/xmcd.desktop share/kde/services/kmixctrl_restore.desktop +share/kde/servicetypes/audiomidi.desktop +@comment dirrm share/kde/servicetypes @comment dirrm share/kde/services @comment dirrm share/kde/mimelnk/text +@comment dirrm share/kde/mimelnk/audio @comment dirrm share/kde/mimelnk/application @comment dirrm share/kde/icons/hicolor/48x48/apps @comment dirrm share/kde/icons/hicolor/32x32/apps @@ -940,6 +972,17 @@ share/kde/services/kmixctrl_restore.desktop @dirrm share/kde/apps/kmidi/config/BITMAPS @dirrm share/kde/apps/kmidi/config @dirrm share/kde/apps/kmidi +@dirrm share/kde/apps/kmid/maps +@dirrm share/kde/apps/kmid/icons/hicolor/32x32/actions +@dirrm share/kde/apps/kmid/icons/hicolor/32x32 +@dirrm share/kde/apps/kmid/icons/hicolor/22x22/actions +@dirrm share/kde/apps/kmid/icons/hicolor/22x22 +@dirrm share/kde/apps/kmid/icons/hicolor/16x16/actions +@dirrm share/kde/apps/kmid/icons/hicolor/16x16 +@dirrm share/kde/apps/kmid/icons/hicolor +@dirrm share/kde/apps/kmid/icons +@dirrm share/kde/apps/kmid/fm +@dirrm share/kde/apps/kmid @comment dirrm share/kde/apps/kicker/applets @dirrm share/kde/apps/artscontrol @dirrm share/kde/apps/artsbuilder/pics diff --git a/audio/kdemultimedia2/distinfo b/audio/kdemultimedia2/distinfo index 7a075795ff0..370f084fc3f 100644 --- a/audio/kdemultimedia2/distinfo +++ b/audio/kdemultimedia2/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2001/10/15 22:45:55 skrll Exp $ +$NetBSD: distinfo,v 1.6 2001/11/13 21:11:54 jlam Exp $ SHA1 (kdemultimedia-2.2.1.tar.bz2) = fcff29a9498d7023193132abd2e1e6dbd2d82b17 Size (kdemultimedia-2.2.1.tar.bz2) = 4683892 bytes -SHA1 (patch-aa) = 789123bef295d72f84bb08ef0dc59ce392ca8eaf +SHA1 (patch-aa) = bfa0d4835eebe4e6f38ee4d0ad01940c67fb72af SHA1 (patch-ab) = 364d905ff5379535285d3c5d462607c0020451d3 SHA1 (patch-ac) = 9981b9eae552aead074cee46bd0c065dca2e1fca SHA1 (patch-ad) = d32a98772d5367d7230f69b8984913e9c6ab1267 @@ -16,3 +16,4 @@ SHA1 (patch-an) = b6a16911a05d713062b3366ae43e685e6084f259 SHA1 (patch-ao) = 7c909e0d4029087534ab3085c5522ac6929a3502 SHA1 (patch-ap) = e7733176a118c06208337a738a6388711a8d6ec4 SHA1 (patch-aq) = e919b11924c777e805e9aba17ca84359ec64eebd +SHA1 (patch-ar) = 808f111a44af7323fd0d105e29cfe7af828f7021 diff --git a/audio/kdemultimedia2/patches/patch-aa b/audio/kdemultimedia2/patches/patch-aa index c6ad9e00533..597d31d600d 100644 --- a/audio/kdemultimedia2/patches/patch-aa +++ b/audio/kdemultimedia2/patches/patch-aa @@ -1,8 +1,50 @@ -$NetBSD: patch-aa,v 1.4 2001/10/15 22:45:55 skrll Exp $ +$NetBSD: patch-aa,v 1.5 2001/11/13 21:11:55 jlam Exp $ ---- configure.orig Sun Sep 9 06:07:45 2001 +--- configure.orig Sun Sep 9 01:07:45 2001 +++ configure -@@ -8178,7 +8178,7 @@ +@@ -7640,6 +7640,41 @@ + if { (eval echo configure:7641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_vm='-lXxf86dga -lXxf86vm'" ++ ++ lib=Xxf86dga ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "no" ]; then ++ eval "ac_cv_lib_vm=no" ++ fi ++ ++ lib=Xxf86vm ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "no" ]; then ++ eval "ac_cv_lib_vm=no" ++ fi ++ + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -8178,7 +8213,7 @@ au_enable_sun=yes ;; *-*-netbsd*) @@ -11,7 +53,7 @@ $NetBSD: patch-aa,v 1.4 2001/10/15 22:45:55 skrll Exp $ ;; *) echo "configure: warning: No --enable-audio=default audio for $target" 1>&2 -@@ -8194,7 +8194,7 @@ +@@ -8194,7 +8229,7 @@ echo "$ac_t""yes - <sys/soundcard.h>" 1>&6 else case "$target" in @@ -20,7 +62,7 @@ $NetBSD: patch-aa,v 1.4 2001/10/15 22:45:55 skrll Exp $ echo "$ac_t""yes" 1>&6 ;; *) -@@ -11495,6 +11495,7 @@ +@@ -11495,6 +11530,7 @@ case "$host" in *-*-linux*) kscd_compile=yes;; *-*-*bsdi*) kscd_compile=yes;; @@ -28,7 +70,7 @@ $NetBSD: patch-aa,v 1.4 2001/10/15 22:45:55 skrll Exp $ *-*-*bsd*) kscd_compile=no;; *) kscd_compile=yes;; esac -@@ -11641,7 +11642,7 @@ +@@ -11641,7 +11677,7 @@ fi done @@ -37,7 +79,76 @@ $NetBSD: patch-aa,v 1.4 2001/10/15 22:45:55 skrll Exp $ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -@@ -12206,6 +12207,9 @@ +@@ -11905,7 +11941,22 @@ + if { (eval echo configure:11906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ++ lib=Xxf86dga ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "yes" ]; then + x11_dga2=yes ++ fi + + else + echo "configure: failed program was:" >&5 +@@ -11939,7 +11990,22 @@ + if { (eval echo configure:11940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ++ lib=Xv ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "yes" ]; then + x11_xv=yes ++ fi + + else + echo "configure: failed program was:" >&5 +@@ -11973,7 +12039,22 @@ + if { (eval echo configure:11974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ++ lib=Xxf86vm ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "yes" ]; then + x11_xvidmode=yes ++ fi + + else + echo "configure: failed program was:" >&5 +@@ -12206,6 +12287,9 @@ kde_mpeglib_compiles=no case "$OS_TYPE" in @@ -47,7 +158,7 @@ $NetBSD: patch-aa,v 1.4 2001/10/15 22:45:55 skrll Exp $ Linux) kde_mpeglib_compiles=yes ;; -@@ -12416,6 +12420,7 @@ +@@ -12416,6 +12500,7 @@ NetBSD) echo "$ac_t""NetBSD :Unknown hardware. You will have problems!!" 1>&6 OS_TYPE="BSD" diff --git a/audio/kdemultimedia2/patches/patch-ar b/audio/kdemultimedia2/patches/patch-ar new file mode 100644 index 00000000000..447a3253f17 --- /dev/null +++ b/audio/kdemultimedia2/patches/patch-ar @@ -0,0 +1,16 @@ +$NetBSD: patch-ar,v 1.1 2001/11/13 21:11:55 jlam Exp $ + +--- mpeglib/lib/util/render/x11/imageDeskX11.cpp.orig Thu Jan 11 10:40:00 2001 ++++ mpeglib/lib/util/render/x11/imageDeskX11.cpp +@@ -397,7 +397,11 @@ + } + + int bestMode = -1; ++#if defined(__NetBSD__) ++ int border, minBorder = INT_MAX; ++#else + int border, minBorder = MAXINT; ++#endif + + for (i = 0; i < vm_count; i++) { + printf("mode %d: %dx%d\n",i, vm_modelines[i]->hdisplay,vm_modelines[i]->vdisplay); |