[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.5.4-7-153-g48e5580
The following commit has been merged in the debian-experimental-3.7 branch:
commit 22f694226faa2c51971e98b4549939e5d04510c3
Author: Rene Engelhard <rene@debian.org>
Date: Tue Aug 14 10:31:35 2012 +0200
gstreamer 1.0 adaptions
diff --git a/rules b/rules
index bafaf5e..138ec98 100755
--- a/rules
+++ b/rules
@@ -196,6 +196,7 @@ USE_SHARED_LPSOLVE=y
LPSOLVE_MIN_VERSION= (>= 5.5.0.13-5+b1)
USE_DBUS=y
USE_GSTREAMER=y
+GSTREAMER_VERSION=0.10
SYSTEM_STUFF += neon
NEON_SECTYPE=gnutls
NEONSONR=27
@@ -1128,11 +1129,15 @@ ifeq "$(USE_DBUS)" "y"
endif
ifeq "$(USE_GSTREAMER)" "y"
- BUILD_DEPS += , libgstreamer-plugins-base0.10-dev
- GSTREAMER_PLUGINS_SUGGESTS += , gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, gstreamer0.10-plugins-ugly, gstreamer0.10-plugins-bad, gstreamer0.10-ffmpeg
- DBG_DBG_SUGGESTS+= , libgstreamer0.10-0-dbg
+ ifeq "$(GSTREAMER_VERSION)" "1.0"
+ BUILD_DEPS += , libgstreamer$(GSTREAMER_VERSION)-dev
+ CONFIGURE_FLAGS += --enable-gstreamer
+ endif
+ BUILD_DEPS += , libgstreamer-plugins-base$(GSTREAMER_VERSION)-dev
+ GSTREAMER_PLUGINS_SUGGESTS += , gstreamer$(GSTREAMER_VERSION)-plugins-base, gstreamer$(GSTREAMER_VERSION)-plugins-good, gstreamer$(GSTREAMER_VERSION)-plugins-ugly, gstreamer$(GSTREAMER_VERSION)-plugins-bad, gstreamer$(GSTREAMER_VERSION)-ffmpeg
+ DBG_DBG_SUGGESTS+= , libgstreamer$(GSTREAMER_VERSION)-0-dbg
else
- CONFIGURE_FLAGS += --disable-gstreamer
+ CONFIGURE_FLAGS += --disable-gstreamer-0-10
endif
ifneq (,$(filter neon, $(SYSTEM_STUFF)))
--
LibreOffice packaging repository
Reply to: