[Libreoffice-commits] core.git: avmedia/Library_avmediagst.mk avmedia/Module_avmedia.mk config_host.mk.in configure.ac postprocess/Rdb_services.mk Repository.mk
Jan-Marek Glogowski
glogow at fbihome.de
Fri Nov 7 03:53:08 PST 2014
Repository.mk | 2 -
avmedia/Library_avmediagst.mk | 4 +--
avmedia/Module_avmedia.mk | 2 -
config_host.mk.in | 6 ++---
configure.ac | 46 +++++++++++++++++++++---------------------
postprocess/Rdb_services.mk | 2 -
6 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit 65a00c71a5e3a8cdd74ac1a557208e183e23cf01
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Oct 10 23:15:28 2014 +0200
Clarify configure GStreamer handling
Currrently --disables-gstreamer disables GStreamer API 1.0 support
and --enable-gstreamer-0-10 enables GStreamer API 0.10 support. To
build with GStreamer API 0.10 you need to --disable-gstreamer and
--enable-gstreamer-0-10, which doesn't seem logical.
But actually it's possible to build both avmedia GStreamer backends,
so this changes:
* --disable-gstreamer to --disable-gstreamer-1-0
* configure variables to include the GStreamer API version "1_0"
* adapts the configure help text
Change-Id: Icffd8cfb9d80b3021e290675e7c9644c2a31fce8
Reviewed-on: https://gerrit.libreoffice.org/11912
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/Repository.mk b/Repository.mk
index 0e7b9b9..fd05e11 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -592,7 +592,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(if $(ENABLE_VLC),avmediavlc) \
- $(if $(ENABLE_GSTREAMER),avmediagst) \
+ $(if $(ENABLE_GSTREAMER_1_0),avmediagst) \
$(if $(ENABLE_GSTREAMER_0_10),avmediagst_0_10) \
$(if $(ENABLE_DIRECTX),avmediawin) \
$(if $(ENABLE_GLTF),avmediaogl) \
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
index 42a6a49..9eae219 100644
--- a/avmedia/Library_avmediagst.mk
+++ b/avmedia/Library_avmediagst.mk
@@ -14,9 +14,9 @@ $(eval $(call gb_Library_set_componentfile,avmediagst,avmedia/source/gstreamer/a
$(eval $(call gb_Library_set_include,avmediagst,\
$$(INCLUDE) \
-I$(SRCDIR)/avmedia/source/inc \
- $(GSTREAMER_CFLAGS) \
+ $(GSTREAMER_1_0_CFLAGS) \
))
-$(eval $(call gb_Library_add_libs,avmediagst,$(GSTREAMER_LIBS)))
+$(eval $(call gb_Library_add_libs,avmediagst,$(GSTREAMER_1_0_LIBS)))
$(eval $(call gb_Library_use_external,avmediagst,boost_headers))
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index f0108e5..06af36f 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_Module_add_l10n_targets,avmedia,\
AllLangResTarget_avmedia \
))
-ifeq ($(ENABLE_GSTREAMER),TRUE)
+ifeq ($(ENABLE_GSTREAMER_1_0),TRUE)
$(eval $(call gb_Module_add_targets,avmedia,\
Library_avmediagst \
))
diff --git a/config_host.mk.in b/config_host.mk.in
index 98dad1d..7a5d42a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -134,8 +134,8 @@ export ENABLE_GLTF=@ENABLE_GLTF@
export SYSTEM_LIBGLTF=@SYSTEM_LIBGLTF@
export LIBGLTF_CFLAGS=@LIBGLTF_CFLAGS@
export LIBGLTF_LIBS=@LIBGLTF_LIBS@
-export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@
export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@
+export ENABLE_GSTREAMER_1_0=@ENABLE_GSTREAMER_1_0@
export ENABLE_GTK3=@ENABLE_GTK3@
export ENABLE_GTK=@ENABLE_GTK@
export ENABLE_GTK_PRINT=@ENABLE_GTK_PRINT@
@@ -227,8 +227,8 @@ export HARFBUZZ_LIBS=$(gb_SPACE)@HARFBUZZ_LIBS@
export GSSAPI_LIBS=@GSSAPI_LIBS@
export GSTREAMER_0_10_CFLAGS=$(gb_SPACE)@GSTREAMER_0_10_CFLAGS@
export GSTREAMER_0_10_LIBS=$(gb_SPACE)@GSTREAMER_0_10_LIBS@
-export GSTREAMER_CFLAGS=$(gb_SPACE)@GSTREAMER_CFLAGS@
-export GSTREAMER_LIBS=$(gb_SPACE)@GSTREAMER_LIBS@
+export GSTREAMER_1_0_CFLAGS=$(gb_SPACE)@GSTREAMER_1_0_CFLAGS@
+export GSTREAMER_1_0_LIBS=$(gb_SPACE)@GSTREAMER_1_0_LIBS@
export GTHREAD_CFLAGS=$(gb_SPACE)@GTHREAD_CFLAGS@
export GTHREAD_LIBS=$(gb_SPACE)@GTHREAD_LIBS@
export GTK3_CFLAGS=$(gb_SPACE)@GTK3_CFLAGS@
diff --git a/configure.ac b/configure.ac
index b06f16b..b1fada1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -542,12 +542,11 @@ case "$host_os" in
solaris*)
test_gtk=yes
- build_gstreamer=yes
+ build_gstreamer_1_0=yes
build_gstreamer_0_10=yes
test_tde=yes
test_kde=yes
test_freetype=yes
- test_gstreamer=yes
_os=SunOS
dnl ===========================================================
@@ -572,7 +571,7 @@ solaris*)
linux-gnu*|k*bsd*-gnu*)
test_gtk=yes
- build_gstreamer=yes
+ build_gstreamer_1_0=yes
build_gstreamer_0_10=yes
test_tde=yes
test_kde=yes
@@ -665,7 +664,7 @@ darwin*) # Mac OS X or iOS
freebsd*)
test_gtk=yes
- build_gstreamer=yes
+ build_gstreamer_1_0=yes
build_gstreamer_0_10=yes
test_tde=yes
test_kde=yes
@@ -695,7 +694,7 @@ freebsd*)
*netbsd*)
test_gtk=yes
- build_gstreamer=yes
+ build_gstreamer_1_0=yes
build_gstreamer_0_10=yes
test_tde=no
test_kde=no
@@ -724,7 +723,7 @@ openbsd*)
dragonfly*)
test_gtk=yes
- build_gstreamer=yes
+ build_gstreamer_1_0=yes
build_gstreamer_0_10=yes
test_tde=yes
test_kde=yes
@@ -735,7 +734,7 @@ dragonfly*)
;;
linux-android*)
- build_gstreamer=no
+ build_gstreamer_1_0=no
build_gstreamer_0_10=no
enable_lotuswordpro=no
enable_mpl_subset=yes
@@ -1207,14 +1206,14 @@ AC_ARG_ENABLE(randr-link,
[Disable linking with libXrandr, instead dynamically open it at runtime.]),
,enable_randr_link=yes)
-AC_ARG_ENABLE(gstreamer,
- AS_HELP_STRING([--disable-gstreamer],
+AC_ARG_ENABLE(gstreamer-1-0,
+ AS_HELP_STRING([--disable-gstreamer-1-0],
[Disable building with the new gstreamer 1.0 avmedia backend.]),
-,enable_gstreamer=yes)
+,enable_gstreamer_1_0=yes)
AC_ARG_ENABLE(gstreamer-0-10,
AS_HELP_STRING([--enable-gstreamer-0-10],
- [Enable building the gstreamer 0.10 avmedia backend.]),
+ [Enable building with the gstreamer 0.10 avmedia backend.]),
,enable_gstreamer_0_10=no)
AC_ARG_ENABLE(vlc,
@@ -4594,7 +4593,7 @@ if test "$enable_headless" = "yes"; then
test_dbus=no
test_fontconfig=yes
test_gtk=no
- build_gstreamer=no
+ build_gstreamer_1_0=no
build_gstreamer_0_10=no
test_tde=no
test_kde=no
@@ -10125,36 +10124,37 @@ AC_SUBST(ENABLE_CAIRO_CANVAS)
dnl ===================================================================
dnl Check whether the GStreamer libraries are available.
+dnl It's possible to build avmedia with both GStreamer backends!
dnl ===================================================================
-ENABLE_GSTREAMER=""
+ENABLE_GSTREAMER_1_0=""
-if test "$build_gstreamer" = "yes"; then
+if test "$build_gstreamer_1_0" = "yes"; then
AC_MSG_CHECKING([whether to enable the new GStreamer 1.0 avmedia backend])
- if test "$enable_avmedia" = yes -a "$enable_gstreamer" != no; then
- ENABLE_GSTREAMER="TRUE"
+ if test "$enable_avmedia" = yes -a "$enable_gstreamer_1_0" != no; then
+ ENABLE_GSTREAMER_1_0="TRUE"
AC_MSG_RESULT([yes])
- PKG_CHECK_MODULES( GSTREAMER, gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-video-1.0 )
- GSTREAMER_CFLAGS=$(printf '%s' "$GSTREAMER_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
+ PKG_CHECK_MODULES( [GSTREAMER_1_0], [gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-video-1.0] )
+ GSTREAMER_1_0_CFLAGS=$(printf '%s' "$GSTREAMER_1_0_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
else
AC_MSG_RESULT([no])
fi
fi
-AC_SUBST(GSTREAMER_CFLAGS)
-AC_SUBST(GSTREAMER_LIBS)
-AC_SUBST(ENABLE_GSTREAMER)
+AC_SUBST(GSTREAMER_1_0_CFLAGS)
+AC_SUBST(GSTREAMER_1_0_LIBS)
+AC_SUBST(ENABLE_GSTREAMER_1_0)
ENABLE_GSTREAMER_0_10=""
if test "$build_gstreamer_0_10" = "yes"; then
- AC_MSG_CHECKING([whether to enable the GStreamer avmedia backend])
+ AC_MSG_CHECKING([whether to enable the GStreamer 0.10 avmedia backend])
if test "$enable_avmedia" = yes -a "$enable_gstreamer_0_10" != no; then
ENABLE_GSTREAMER_0_10="TRUE"
AC_MSG_RESULT([yes])
PKG_CHECK_MODULES( [GSTREAMER_0_10], [gstreamer-0.10 gstreamer-plugins-base-0.10 gstreamer-interfaces-0.10],, [
- PKG_CHECK_MODULES( [GSTREAMER_0_10], [gstreamer-0.10 gstreamer-plugins-base-0.10] )
+ PKG_CHECK_MODULES( [GSTREAMER_0_10], [gstreamer-0.10 gstreamer-plugins-base-0.10] )
])
GSTREAMER_0_10_CFLAGS=$(printf '%s' "$GSTREAMER_0_10_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
else
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 220aeda..affb629 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -200,7 +200,7 @@ $(eval $(call gb_Rdb_add_components,services,\
$(if $(ENABLE_GNOMEVFS), \
ucb/source/ucp/gvfs/ucpgvfs \
) \
- $(if $(ENABLE_GSTREAMER), \
+ $(if $(ENABLE_GSTREAMER_1_0), \
avmedia/source/gstreamer/avmediagstreamer \
) \
$(if $(ENABLE_GSTREAMER_0_10), \
More information about the Libreoffice-commits
mailing list