[pulseaudio-commits] Branch 'next' - 2 commits - orc.mak src/daemon src/Makefile.am

[Tanu Kaskinen]

 orc.mak                              |    2 ++
 src/Makefile.am                      |    4 ++--
 src/daemon/pulseaudio-kde.desktop.in |    1 -
 src/daemon/pulseaudio.desktop.in     |    1 -
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6ac599c1f41ed19db8aed1d5195bfd456fee9a99
Author: Wim Taymans <wtaymans at redhat.com>
Date:   Thu Jan 23 12:21:53 2014 +0100

    daemon: Remove deprecated Encoding from .desktop files
    
    Encoding is deprecated according to
    http://standards.freedesktop.org/desktop-entry-spec/latest/apc.html

diff --git a/src/daemon/pulseaudio-kde.desktop.in b/src/daemon/pulseaudio-kde.desktop.in
index 0684642..f0bfa8f 100644
--- a/src/daemon/pulseaudio-kde.desktop.in
+++ b/src/daemon/pulseaudio-kde.desktop.in
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 _Name=PulseAudio Sound System KDE Routing Policy
 _Comment=Start the PulseAudio Sound System with KDE Routing Policy
 Exec=start-pulseaudio-kde
diff --git a/src/daemon/pulseaudio.desktop.in b/src/daemon/pulseaudio.desktop.in
index b75b378..ce99382 100644
--- a/src/daemon/pulseaudio.desktop.in
+++ b/src/daemon/pulseaudio.desktop.in
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 _Name=PulseAudio Sound System
 _Comment=Start the PulseAudio Sound System
 Exec=start-pulseaudio-x11

commit a360b29a0a51248e1360f9c028401224d10cfbfa
Author: Dominique Leuenberger <dimstar at opensuse.org>
Date:   Fri Jan 24 21:45:52 2014 +0100

    build-sys: Move ORC_SOURCE definitions outside of "if HAVE_ORC"
    
    Not having ORC_SOURCE defined results in different tarballs depending on
    whether the dev issuing 'make dist' has orc support enabled or disabled.
    
    Specifying ORC_SOURCE unconditionally addresses that, without causing
    negative effects on users not having orc in the end.

diff --git a/orc.mak b/orc.mak
index 5a6ff96..a1069a7 100644
--- a/orc.mak
+++ b/orc.mak
@@ -22,6 +22,7 @@
 
 EXTRA_DIST += $(addsuffix .orc,$(ORC_SOURCE))
 
+if HAVE_ORC
 ORC_BUILT_SOURCE = $(addsuffix -orc-gen.c,$(ORC_SOURCE))
 ORC_BUILT_HEADER = $(addsuffix -orc-gen.h,$(ORC_SOURCE))
 
@@ -44,3 +45,4 @@ cp_v_gen_0 = @echo "  CP     $@";
 %-orc-gen.h: %.orc
 	@mkdir -p $(@D)
 	$(orcc_v_gen)$(ORCC) --header -o $@ $<
+endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 0d3ab0b..857fda3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -932,8 +932,8 @@ libpulsecore_mix_neon_la_CFLAGS = $(AM_CFLAGS) $(NEON_CFLAGS)
 libpulsecore_ at PA_MAJORMINOR@_la_LIBADD += libpulsecore_sconv_neon.la libpulsecore_mix_neon.la
 endif
 
-if HAVE_ORC
 ORC_SOURCE += pulsecore/svolume
+if HAVE_ORC
 libpulsecore_ at PA_MAJORMINOR@_la_SOURCES += pulsecore/svolume_orc.c
 nodist_libpulsecore_ at PA_MAJORMINOR@_la_SOURCES = pulsecore/svolume-orc-gen.c pulsecore/svolume-orc-gen.h
 libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS += $(ORC_CFLAGS)
@@ -1950,8 +1950,8 @@ module_echo_cancel_la_SOURCES += \
 		modules/echo-cancel/adrian-aec.c modules/echo-cancel/adrian-aec.h \
 		modules/echo-cancel/adrian.c modules/echo-cancel/adrian.h
 module_echo_cancel_la_CFLAGS += -DHAVE_ADRIAN_EC=1
-if HAVE_ORC
 ORC_SOURCE += modules/echo-cancel/adrian-aec
+if HAVE_ORC
 nodist_module_echo_cancel_la_SOURCES = \
 		modules/echo-cancel/adrian-aec-orc-gen.c \
 		modules/echo-cancel/adrian-aec-orc-gen.h