diff options
-rw-r--r-- | kde/kdelibs/.footprint.i686 | 2 | ||||
-rw-r--r-- | kde/kdelibs/.footprint.x86_64 | 2 | ||||
-rw-r--r-- | kde/kdelibs/.md5sum.i686 | 2 | ||||
-rw-r--r-- | kde/kdelibs/.md5sum.x86_64 | 2 | ||||
-rw-r--r-- | kde/kdelibs/FindPulseAudio.cmake | 76 | ||||
-rwxr-xr-x | kde/kdelibs/Pkgfile | 8 |
6 files changed, 86 insertions, 6 deletions
diff --git a/kde/kdelibs/.footprint.i686 b/kde/kdelibs/.footprint.i686 index 8ac2f2849..274325d88 100644 --- a/kde/kdelibs/.footprint.i686 +++ b/kde/kdelibs/.footprint.i686 @@ -3638,6 +3638,8 @@ drwxr-xr-x root/root usr/share/kde4/services/qimageioplugins/ -rw-r--r-- root/root usr/share/kde4/services/qimageioplugins/psd.desktop -rw-r--r-- root/root usr/share/kde4/services/qimageioplugins/ras.desktop -rw-r--r-- root/root usr/share/kde4/services/qimageioplugins/rgb.desktop +-rw-r--r-- root/root usr/share/kde4/services/qimageioplugins/svg+xml-compressed.desktop +-rw-r--r-- root/root usr/share/kde4/services/qimageioplugins/svg+xml.desktop -rw-r--r-- root/root usr/share/kde4/services/qimageioplugins/tga.desktop -rw-r--r-- root/root usr/share/kde4/services/qimageioplugins/tiff.desktop -rw-r--r-- root/root usr/share/kde4/services/qimageioplugins/xbm.desktop diff --git a/kde/kdelibs/.footprint.x86_64 b/kde/kdelibs/.footprint.x86_64 index 8ac2f2849..274325d88 100644 --- a/kde/kdelibs/.footprint.x86_64 +++ b/kde/kdelibs/.footprint.x86_64 @@ -3638,6 +3638,8 @@ drwxr-xr-x root/root usr/share/kde4/services/qimageioplugins/ -rw-r--r-- root/root usr/share/kde4/services/qimageioplugins/psd.desktop -rw-r--r-- root/root usr/share/kde4/services/qimageioplugins/ras.desktop -rw-r--r-- root/root usr/share/kde4/services/qimageioplugins/rgb.desktop +-rw-r--r-- root/root usr/share/kde4/services/qimageioplugins/svg+xml-compressed.desktop +-rw-r--r-- root/root usr/share/kde4/services/qimageioplugins/svg+xml.desktop -rw-r--r-- root/root usr/share/kde4/services/qimageioplugins/tga.desktop -rw-r--r-- root/root usr/share/kde4/services/qimageioplugins/tiff.desktop -rw-r--r-- root/root usr/share/kde4/services/qimageioplugins/xbm.desktop diff --git a/kde/kdelibs/.md5sum.i686 b/kde/kdelibs/.md5sum.i686 index 4f7ba97a0..7b744ff8b 100644 --- a/kde/kdelibs/.md5sum.i686 +++ b/kde/kdelibs/.md5sum.i686 @@ -1 +1 @@ -eaeacc3c94501f343eb7c4ef74c7475b kdelibs-4.7.1.tar.bz2 +abe4c8f848366bcab16c57bbaeb86f1f kdelibs-4.7.2.tar.bz2 diff --git a/kde/kdelibs/.md5sum.x86_64 b/kde/kdelibs/.md5sum.x86_64 index 4f7ba97a0..7b744ff8b 100644 --- a/kde/kdelibs/.md5sum.x86_64 +++ b/kde/kdelibs/.md5sum.x86_64 @@ -1 +1 @@ -eaeacc3c94501f343eb7c4ef74c7475b kdelibs-4.7.1.tar.bz2 +abe4c8f848366bcab16c57bbaeb86f1f kdelibs-4.7.2.tar.bz2 diff --git a/kde/kdelibs/FindPulseAudio.cmake b/kde/kdelibs/FindPulseAudio.cmake new file mode 100644 index 000000000..d0392420b --- /dev/null +++ b/kde/kdelibs/FindPulseAudio.cmake @@ -0,0 +1,76 @@ +# Try to find the PulseAudio library +# +# Once done this will define: +# +# PULSEAUDIO_FOUND - system has the PulseAudio library +# PULSEAUDIO_INCLUDE_DIR - the PulseAudio include directory +# PULSEAUDIO_LIBRARY - the libraries needed to use PulseAudio +# PULSEAUDIO_MAINLOOP_LIBRARY - the libraries needed to use PulsAudio Mailoop +# +# Copyright (c) 2008, Matthias Kretz, <kretz@kde.org> +# Copyright (c) 2009, Marcus Hufgard, <Marcus.Hufgard@hufgard.de> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if (NOT PULSEAUDIO_MINIMUM_VERSION) + set(PULSEAUDIO_MINIMUM_VERSION "1.0") +endif (NOT PULSEAUDIO_MINIMUM_VERSION) + +if (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY AND PULSEAUDIO_MAINLOOP_LIBRARY) + # Already in cache, be silent + set(PULSEAUDIO_FIND_QUIETLY TRUE) +endif (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY AND PULSEAUDIO_MAINLOOP_LIBRARY) + +if (NOT WIN32) + include(FindPkgConfig) + pkg_check_modules(PC_PULSEAUDIO libpulse>=${PULSEAUDIO_MINIMUM_VERSION}) + pkg_check_modules(PC_PULSEAUDIO_MAINLOOP libpulse-mainloop-glib) +endif (NOT WIN32) + +FIND_PATH(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h + HINTS + ${PC_PULSEAUDIO_INCLUDEDIR} + ${PC_PULSEAUDIO_INCLUDE_DIRS} + ) + +FIND_LIBRARY(PULSEAUDIO_LIBRARY NAMES pulse libpulse + HINTS + ${PC_PULSEAUDIO_LIBDIR} + ${PC_PULSEAUDIO_LIBRARY_DIRS} + ) + +FIND_LIBRARY(PULSEAUDIO_MAINLOOP_LIBRARY NAMES pulse-mainloop pulse-mainloop-glib libpulse-mainloop-glib + HINTS + ${PC_PULSEAUDIO_LIBDIR} + ${PC_PULSEAUDIO_LIBRARY_DIRS} + ) + +if (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY) + include(MacroEnsureVersion) + + # get PulseAudio's version from its version.h, and compare it with our minimum version + file(STRINGS "${PULSEAUDIO_INCLUDE_DIR}/pulse/version.h" pulse_version_h + REGEX ".*pa_get_headers_version\\(\\).*" + ) + string(REGEX REPLACE ".*pa_get_headers_version\\(\\)\ \\(\"([0-9]+\\.[0-9]+)\"\\).*" "\\1" + PULSEAUDIO_VERSION "${pulse_version_h}") + macro_ensure_version("${PULSEAUDIO_MINIMUM_VERSION}" "${PULSEAUDIO_VERSION}" PULSEAUDIO_FOUND) +else (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY) + set(PULSEAUDIO_FOUND FALSE) +endif (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY) + +if (PULSEAUDIO_FOUND) + if (NOT PULSEAUDIO_FIND_QUIETLY) + message(STATUS "Found PulseAudio: ${PULSEAUDIO_LIBRARY}") + if (PULSEAUDIO_MAINLOOP_LIBRARY) + message(STATUS "Found PulseAudio Mainloop: ${PULSEAUDIO_MAINLOOP_LIBRARY}") + else (PULSAUDIO_MAINLOOP_LIBRARY) + message(STATUS "Could NOT find PulseAudio Mainloop Library") + endif (PULSEAUDIO_MAINLOOP_LIBRARY) + endif (NOT PULSEAUDIO_FIND_QUIETLY) +else (PULSEAUDIO_FOUND) + message(STATUS "Could NOT find PulseAudio") +endif (PULSEAUDIO_FOUND) + +mark_as_advanced(PULSEAUDIO_INCLUDE_DIR PULSEAUDIO_LIBRARY PULSEAUDIO_MAINLOOP_LIBRARY) diff --git a/kde/kdelibs/Pkgfile b/kde/kdelibs/Pkgfile index d68484498..d4f2aa490 100755 --- a/kde/kdelibs/Pkgfile +++ b/kde/kdelibs/Pkgfile @@ -2,14 +2,14 @@ # URL: http://www.kde.org # Maintainer: NuTyX packager Team # Packager: lesibel at free dot fr -# Depends on: qt,cmake,automoc4,phonon,strigi,attica,libdbusmenu-qt,polkit-qt,shared-desktop-ontologies,xorg-libxscrnsaver,soprano,qca,acl,grantlee,aspell,enchant,avahi,ca-certificates -# Run on: phonon,strigi,attica,libdbusmenu-qt,polkit-qt,shared-desktop-ontologies,xorg-libxscrnsaver,soprano,qca,acl,grantlee,aspell,enchant,avahi,ca-certificates +# Depends on: qt,cmake,automoc4,phonon,strigi,attica,libdbusmenu-qt,polkit-qt,shared-desktop-ontologies,xorg-libxscrnsaver,soprano,qca,acl,grantlee,aspell,enchant,avahi,ca-certificates,pulseaudio +# Run on: phonon,strigi,attica,libdbusmenu-qt,polkit-qt,shared-desktop-ontologies,xorg-libxscrnsaver,soprano,qca,acl,grantlee,aspell,enchant,avahi,ca-certificates,pulseaudio name=kdelibs -version=4.7.1 +version=4.7.2 release=1 -source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2 ) +source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2) build() { cd $name-$version |