From 11dae28a1f4c54ba34887d522075ea44c7c8da98 Mon Sep 17 00:00:00 2001 From: makc Date: Thu, 14 Jun 2012 16:42:04 +0000 Subject: KDE/FreeBSD team presents KDE SC 4.8.4, probably the last release in 4.8.x series. Official announcement: http://kde.org/announcements/announce-4.8.4.php --- multimedia/kdemultimedia4/Makefile | 1 - multimedia/kdemultimedia4/distinfo | 4 +- .../files/patch-kmix__CMakeLists.txt | 54 ---------------------- 3 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 multimedia/kdemultimedia4/files/patch-kmix__CMakeLists.txt (limited to 'multimedia') diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile index 179b8a81eb80..7ec6c0830d6f 100644 --- a/multimedia/kdemultimedia4/Makefile +++ b/multimedia/kdemultimedia4/Makefile @@ -6,7 +6,6 @@ PORTNAME= kdemultimedia PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 CATEGORIES= multimedia kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo index ae137f1eee14..24a0836138fe 100644 --- a/multimedia/kdemultimedia4/distinfo +++ b/multimedia/kdemultimedia4/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/kdemultimedia-4.8.3.tar.xz) = 9dbad22a853cfc3042305218035ad097b9cb1da287591ace410f9fe430e1b4c8 -SIZE (KDE/kdemultimedia-4.8.3.tar.xz) = 1501996 +SHA256 (KDE/kdemultimedia-4.8.4.tar.xz) = 845e30056e48eef00e966b9d64d1a0fc2ed9877c82a8bbc7253aac7984dfa640 +SIZE (KDE/kdemultimedia-4.8.4.tar.xz) = 1500644 diff --git a/multimedia/kdemultimedia4/files/patch-kmix__CMakeLists.txt b/multimedia/kdemultimedia4/files/patch-kmix__CMakeLists.txt deleted file mode 100644 index 450a9bda9a45..000000000000 --- a/multimedia/kdemultimedia4/files/patch-kmix__CMakeLists.txt +++ /dev/null @@ -1,54 +0,0 @@ -commit 7d8054b0e80e8a060c37f815ceb11d66cd67d302 -Author: Raphael Kubo da Costa -Date: Sat May 26 12:35:20 2012 -0300 - - Do not look for libcanberra instead of undefining HAVE_CANBERRA. - - Follow-up to commit e1cfb1341a21437e0406c421161ff280f6b77fdc. Instead - of simply #undef'ing HAVE_CANBERRA in mixer_pulse.cpp, it is better to - not look for libcanberra at compile-time, otherwise CMake will still - try to link agaist libcanberra via -lcanberra instead of - -l/path/to/libcanberra.so (this is due to libcanberra being found via - pkg-config instead of CMake; I will fix this in master in a few - minutes) and break compilation when libcanberra is not in a standard - linker path. - - CCMAIL: esken@kde.org - CCMAIL: colin@mageia.org - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b3dff75..bf8a800 100644 ---- kmix/CMakeLists.txt -+++ kmix/CMakeLists.txt -@@ -9,8 +9,11 @@ find_package(Alsa) - macro_optional_find_package(PulseAudio "0.9.12") - macro_log_feature(PULSEAUDIO_FOUND "PulseAudio" "PulseAudio Audio Server" "http://www.pulseaudio.org/" FALSE "0.9.12" "libpulse is needed to let KMix control PulseAudio") - find_package(GLIB2) --pkg_check_modules(CANBERRA libcanberra) --macro_log_feature(CANBERRA_FOUND "libcanberra" "libcanberra audio library" "http://0pointer.de/lennart/projects/libcanberra/" FALSE "" "libcanberra is needed for kmix sound feedback") -+ -+# FIXME: Disable libcanberra support in the 4.8 branch because it is -+# still under development in master. -+# pkg_check_modules(CANBERRA libcanberra) -+# macro_log_feature(CANBERRA_FOUND "libcanberra" "libcanberra audio library" "http://0pointer.de/lennart/projects/libcanberra/" FALSE "" "libcanberra is needed for kmix sound feedback") - - alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h) - -diff --git a/backends/mixer_pulse.cpp b/backends/mixer_pulse.cpp -index 51c7dc9..7a51b72 100644 ---- kmix/backends/mixer_pulse.cpp -+++ kmix/backends/mixer_pulse.cpp -@@ -32,13 +32,6 @@ - #include - #include - --// Undef'ing HAVE_CANBERRA here, because it should not yet be active --// in bracnh 4.8 and I cannot get it disabled otherwise. --// Commenting out pkg_check_modules(CANBERRA libcanberra) in --// kmix/CMakeLists.txt doesn't search for canberra, but still --// HAVE_CANBERRA is defined. --#undef HAVE_CANBERRA -- - #if defined(HAVE_CANBERRA) - # include - #endif -- cgit