[Lunar-commits] <moonbase-other> Merge branch 'master' of github.com:lunar-linux/moonbase-other

[Florin Braescu]

commit 7c19febcbc8d8d6375150c7c8edb2941e55accf9
Author: Florin Braescu <florin at lunar-linux.org>
Date: Mon, 10 Nov 2014 18:00:50 +0200
URL: https://github.com/lunar-linux/moonbase-other/commit/7c19febcbc8d8d6375150c7c8edb2941e55accf9

Merge branch 'master' of github.com:lunar-linux/moonbase-other
---
  audio/pulseaudio/BUILD                | +10/-0    
  audio/pulseaudio/DEPENDS              | +5/-2     
  audio/webrtc-audio-processing/DETAILS | +21/-0    
  libs/poppler/BUILD                    | +4/-0     
  4 files changed, 40 insertions(+), 2 deletions(-)

--- a/audio/pulseaudio/BUILD
+++ b/audio/pulseaudio/BUILD
@@ -1,4 +1,14 @@
 
+# Obviously if bluez4 we want to disable bluez-5. However since bluez-5 provides a
+# compatibility layer for bluez4 we want both enabled if bluez-5 is installed.
+  if in_depends $MODULE bluez ; then
+    OPTS+=" --enable-bluez4 --disable-bluez5"
+     else
+    if in_depends $MODULE bluez-5 ; then
+      OPTS+=" --enable-bluez5 --enable-bluez4"
+    fi
+  fi &&
+
   if module_installed systemd ; then
      OPTS+=" --with-udev-rules-dir=/usr/lib/udev/rules.d"
   fi &&
--- a/audio/pulseaudio/DEPENDS
+++ b/audio/pulseaudio/DEPENDS
@@ -20,8 +20,6 @@ optional_depends "GConf"         "--enable-gconf"       "--disable-gconf"      "
 optional_depends "gtk+-3"        "--enable-gtk3"        "--disable-gtk3"       "optional Gtk+ 3 support"
 optional_depends "libsamplerate" "--enable-samplerate"  "--disable-samplerate" "optional libsamplerate support"
 optional_depends "openssl"       "--enable-openssl"     "--disable-openssl"    "for OpenSSL support"
-optional_depends "bluez"         "--enable-bluez4"      "--disable-bluez4"     "optional BlueZ 4 support"
-optional_depends "bluez-5"       "--enable-bluez5"      "--disable-bluez5"     "optional BlueZ 5 support"
 optional_depends "orc"           "--enable-orc"         "--disable-orc"        "for orc support"
 optional_depends "esound"        "--enable-esound"      "--disable-esound"     "for esound support"
 
@@ -29,3 +27,8 @@ optional_depends "alsa-oss"      "--enable-oss-output --enable-oss-wrapper"   \
                                  "--disable-oss-output --disable-oss-wrapper" \
                                  "optional OSS output support"
 
+optional_depends "webrtc-audio-processing" "--enable-webrtc-aec" \
+                 "--disable-webrtc-aec" "For WebRTC echo cancellation support"
+
+# We take care of which bluez to enable in the BUILD
+optional_depends "%BLUEZ"        ""      ""     "optional BlueZ support"
--- /dev/null
+++ b/audio/webrtc-audio-processing/DETAILS
@@ -0,0 +1,21 @@
+          MODULE=webrtc-audio-processing
+         VERSION=0.1
+          SOURCE=$MODULE-$VERSION.tar.xz
+      SOURCE_URL=http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/
+      SOURCE_VFY=sha1:cce81e0d7b69fef1e7ce0e3e85a2b740d3f04620
+        WEB_SITE=http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/
+         ENTERED=20141110
+         UPDATED=20141110
+           SHORT="AudioProcessing module from the WebRTC"
+
+cat << EOF
+This is meant to be a more Linux packaging friendly copy of the AudioProcessing
+module from the WebRTC[1] project. The ideal case is that we make no changes to
+the code to make tracking upstream code easy.
+
+This package currently only includes the AudioProcessing bits, but I am very
+open to collaborating with other projects that wish to distribute other bits of
+the code and hopefully eventually have a single point of packaging all the
+WebRTC code to help people reuse the code and avoid keeping private copies in
+several different projects.
+EOF
--- a/libs/poppler/BUILD
+++ b/libs/poppler/BUILD
@@ -7,6 +7,10 @@
     . /etc/profile.d/qt4.rc
   fi &&
 
+  if in_depends poppler qt5; then
+    . /etc/profile.d/qt5.rc
+  fi &&
+
   if [ "`get_module_config DOCS`" = "n" ] ; then
     sedit "s/SUBDIRS = . reference demo/SUBDIRS = . demo/g" glib/Makefile.in
   fi  &&