[libreoffice] 01/02: gstreamer 1.0 is now default upstream; adapt (and remove cases for 0.10...)
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.4
in repository libreoffice.
commit 5ad1f15b7aed103152cb2d30e2bcfb8107f4e7bc
Author: Rene Engelhard <rene@debian.org>
Date: Sat Oct 11 11:14:44 2014 +0000
gstreamer 1.0 is now default upstream; adapt (and remove cases for 0.10...)
---
changelog | 2 +-
rules | 20 ++++++--------------
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/changelog b/changelog
index 63c2f6b..30d2666 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.4.0~alpha1~git20141008-1) UNRELEASED; urgency=low
+libreoffice (1:4.4.0~alpha1~git20141011-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/rules b/rules
index 50d5de6..045b260 100755
--- a/rules
+++ b/rules
@@ -243,7 +243,6 @@ endif
#22:58 < siqi_> I think it's safe to disable it for now
ENABLE_AVAHI=n
USE_GSTREAMER=y
-GSTREAMER_VERSION=1.0
USE_VLC=y
ENABLE_WEBDAV=y
ifeq "$(ENABLE_WEBDAV)" "y"
@@ -1338,16 +1337,14 @@ ifeq "$(ENABLE_AVAHI)" "y"
endif
ifeq "$(USE_GSTREAMER)" "y"
- ifeq "$(GSTREAMER_VERSION)" "1.0"
- BUILD_DEPS += , libgstreamer$(GSTREAMER_VERSION)-dev
- CONFIGURE_FLAGS += --enable-gstreamer --disable-gstreamer-0-10
- 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
+ BUILD_DEPS += , libgstreamer1.0-dev
+ CONFIGURE_FLAGS += --enable-gstreamer
+ BUILD_DEPS += , libgstreamer-plugins-base1.0-dev
+ GSTREAMER_PLUGINS_SUGGESTS += , gstreamer1.0-plugins-base, gstreamer1.0-plugins-good, gstreamer1.0-plugins-ugly, gstreamer1.0-plugins-bad, gstreamer1.0-ffmpeg
+ DBG_DBG_SUGGESTS+= , libgstreamer1.0-0-dbg
AVMEDIA_BE_DEPENDS += , libreoffice-avmedia-backend-gstreamer
else
- CONFIGURE_FLAGS += --disable-gstreamer-0-10
+ CONFIGURE_FLAGS += --disable-gstreamer
DEBHELPER_OPTIONS += -Nlibreoffice-avmedia-backend-gstreamer
endif
@@ -2620,13 +2617,8 @@ endif
ifeq "$(USE_GSTREAMER)" "y"
mkdir -p $(PKGDIR)-avmedia-backend-gstreamer/$(OODIR)/program
- ifeq "$(GSTREAMER_VERSION)" "1.0"
mv $(PKGDIR)-core/$(OODIR)/program/libavmediagst.so \
$(PKGDIR)-avmedia-backend-gstreamer/$(OODIR)/program
- else
- mv $(PKGDIR)-core/$(OODIR)/program/libavmediagst_0_10.so \
- $(PKGDIR)-avmedia-backend-gstreamer/$(OODIR)/program
- endif
endif
ifeq "$(USE_VLC)" "y"
mkdir -p $(PKGDIR)-avmedia-backend-vlc/$(OODIR)/program
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: