All in one because all the changes targets qt (and dependency gst-plugin-base)
A few improvements for 'Qt for embedded Linux' and gstreamer
- gst-plugin-base: add option to select installation for:
decodebin (needed by phonon)
decodebin2
- qt4: qt-sql: start to add option to select the engines
option for sqlite is done
- qt4: if there is no option to select the supported depth it is
better to support all then only 8 and 16
- qt4: phonon: select decodebin of gst-plugin-base if phonon is selected
- qt4: phonon: install the gstreamer backend (phonon useless without backend)
- qt4: phonon: if shared libraries are used also install that for phonon
Signed-off-by: Markus Rathgeb <[email protected]>
===============================================================================
diff -Naur rules.org/gst-plugins-base.in rules/gst-plugins-base.in
--- rules.org/gst-plugins-base.in 2009-07-14 17:19:50.000000000 +0200
+++ rules/gst-plugins-base.in 2009-07-14 17:19:08.000000000 +0200
@@ -53,6 +53,14 @@
bool
prompt "audiotestsrc"
+ config GST_PLUGINS_BASE__DECODEBIN
+ bool
+ prompt "decodebin"
+
+ config GST_PLUGINS_BASE__DECODEBIN_2
+ bool
+ prompt "decodebin2"
+
config GST_PLUGINS_BASE__FFMPEGCOLORSPACE
bool
prompt "ffmpegcolorspace"
diff -Naur rules.org/gst-plugins-base.make rules/gst-plugins-base.make
--- rules.org/gst-plugins-base.make 2009-07-14 17:19:50.000000000 +0200
+++ rules/gst-plugins-base.make 2009-07-14 17:19:08.000000000 +0200
@@ -278,7 +278,16 @@
$(PKGDIR)/$(GST_PLUGINS_BASE)/usr/lib/gstreamer-0.10/libgstaudiotestsrc.so,
\
/usr/lib/gstreamer-0.10/libgstaudiotestsrc.so)
endif
-
+ifdef PTXCONF_GST_PLUGINS_BASE__DECODEBIN
+ @$(call install_copy, gst-plugins-base, 0, 0, 0644, \
+
$(PKGDIR)/$(GST_PLUGINS_BASE)/usr/lib/gstreamer-0.10/libgstdecodebin.so, \
+ /usr/lib/gstreamer-0.10/libgstdecodebin.so)
+endif
+ifdef PTXCONF_GST_PLUGINS_BASE__DECODEBIN_2
+ @$(call install_copy, gst-plugins-base, 0, 0, 0644, \
+
$(PKGDIR)/$(GST_PLUGINS_BASE)/usr/lib/gstreamer-0.10/libgstdecodebin2.so, \
+ /usr/lib/gstreamer-0.10/libgstdecodebin2.so)
+endif
ifdef PTXCONF_GST_PLUGINS_BASE__FFMPEGCOLORSPACE
@$(call install_copy, gst-plugins-base, 0, 0, 0644, \
$(PKGDIR)/$(GST_PLUGINS_BASE)/usr/lib/gstreamer-0.10/libgstffmpegcolorspace.so,
\
diff -Naur rules.org/qt4.in rules/qt4.in
--- rules.org/qt4.in 2009-07-14 17:20:06.000000000 +0200
+++ rules/qt4.in 2009-07-14 17:19:16.000000000 +0200
@@ -12,6 +12,7 @@
select DIRECTFB if QT4_GFX_DIRECTFB_PLUGIN
select GSTREAMER if QT4_BUILD_PHONON
select GST_PLUGINS_BASE if QT4_BUILD_PHONON
+ select GST_PLUGINS_BASE__DECODEBIN if QT4_BUILD_PHONON
select OPENSSL if QT4_OPENSSL
# libsvga is currently not in ptxdist
# select LIBSVGA if QT4_GFX_SVGA_PLUGIN
@@ -585,7 +586,7 @@
The QtNetwork module offers classes that allow you to write TCP/IP
clients and servers.
-config QT4_BUILD_SQL
+menuconfig QT4_BUILD_SQL
bool
prompt "QtSql"
help
@@ -598,6 +599,31 @@
- UI Layer: These classes link the data from a database to
data-aware widgets.
+if QT4_BUILD_SQL
+
+choice
+ prompt "SQLITE support "
+ default QT4_SQLITE_NONE
+
+config QT4_SQLITE_NONE
+ bool "none "
+ help
+ This disables entirely any SQLITE support
+
+config QT4_SQLITE_BUILTIN
+ bool "builtin"
+ help
+ Link the driver into QtSql
+
+config QT4_SQLITE_PLUGIN
+ bool "plugin"
+ help
+ Load the driver at runtime
+endchoice
+
+endif # QT4_BUILD_SQL
+
+
config QT4_BUILD_SCRIPT
bool
default y
diff -Naur rules.org/qt4.make rules/qt4.make
--- rules.org/qt4.make 2009-07-14 17:20:06.000000000 +0200
+++ rules/qt4.make 2009-07-14 17:19:16.000000000 +0200
@@ -82,7 +82,6 @@
-no-sql-mysql \
-no-sql-odbc \
-no-sql-psql \
- -no-sql-sqlite \
-no-sql-sqlite2 \
-no-qt3support \
-no-mmx \
@@ -97,7 +96,7 @@
-force-pkg-config \
-embedded $(QT4_ARCH) \
-qt-decoration-styled \
- -depths 8,16 \
+ -depths all \
-prefix /usr \
-no-armfpa \
-xplatform qws/linux-ptx-g++ \
@@ -426,6 +425,21 @@
QT4_AUTOCONF += -no-scripttools
endif
+# SQL: SQLITE support
+# if QtSql is deactivated QT4_SQLITE_NONE is also deactivated -- but
+# is the option used if no Sql support is build?
+# this should be checked. As workaround use ifeq
+#ifdef PTXCONF_QT4_SQLITE_NONE
+ifeq ($(PTXCONF_QT4_SQLITE_BUILTIN)$(PTXCONF_QT4_SQLITE_PLUGIN),)
+QT4_AUTOCONF += -no-sql-sqlite
+endif
+ifdef PTXCONF_QT4_SQLITE_BUILTIN
+QT4_AUTOCONF += -qt-sql-sqlite
+endif
+ifdef PTXCONF_QT4_SQLITE_PLUGIN
+QT4_AUTOCONF += -plugin-sql-sqlite
+endif
+
ifneq
($(PTXCONF_QT4_DBUS_LOAD)$(PTXCONF_QT4_DBUS_LINK)$(PTXCONF_QT4_BUILD_DESIGNERLIBS)$(PTXCONF_QT4_BUILD_ASSISTANTLIB),)
QT4_BUILD_TOOLS_TARGETS = sub-tools
endif
@@ -588,6 +602,11 @@
@$(call install_link, qt4, libQtSql.so.$(QT_VERSION_L3), \
/usr/lib/libQtSql.so.$(QT_VERSION_L1))
endif
+ifdef PTXCONF_QT4_SQLITE_PLUGIN
+ @$(call install_copy, qt4, 0, 0, 0644, \
+ $(QT4_DIR)/plugins/sqldrivers/libqsqlite.$(QT4_PLUGIN_EXT), \
+ /usr/plugins/sqldrivers/libqsqlite.$(QT4_PLUGIN_EXT))
+endif
ifdef PTXCONF_QT4_BUILD_NETWORK
@$(call install_copy, qt4, 0, 0, 0644, \
$(QT4_DIR)/lib/libQtNetwork.so.$(QT_VERSION_L3), \
@@ -692,6 +711,17 @@
@$(call install_link, qt4, libQtXmlPatterns.so.$(QT_VERSION_L3), \
/usr/lib/libQtXmlPatterns.so.$(QT_VERSION_L1))
endif
+ifdef PTXCONF_QT4_BUILD_PHONON
+ @$(call install_copy, qt4, 0, 0, 0644, \
+ $(QT4_DIR)/lib/libphonon.so.4.3.1, \
+ /usr/lib/libphonon.so.4.3.1)
+ @$(call install_link, qt4, libphonon.so.4.3.1, \
+ /usr/lib/libphonon.so.4.3)
+ @$(call install_link, qt4, libphonon.so.4.3.1, \
+ /usr/lib/libphonon.so.4)
+ @$(call install_link, qt4, libphonon.so.4.3.1, \
+ /usr/lib/libphonon.so)
+endif
endif #PTXCONF_QT4_SHARED
ifdef PTXCONF_QT4_GFX_LINUXFB_PLUGIN
@$(call install_copy, qt4, 0, 0, 0644, \
@@ -756,6 +786,14 @@
$(QT4_DIR)/plugins/iconengines/libqsvgicon.$(QT4_PLUGIN_EXT), \
/usr/plugins/iconengines/libqsvgicon.$(QT4_PLUGIN_EXT))
endif
+ifdef PTXCONF_QT4_BUILD_PHONON
+ @$(call install_copy, qt4, 0, 0, 0644, \
+
$(QT4_DIR)/plugins/phonon_backend/libphonon_gstreamer.$(QT4_PLUGIN_EXT), \
+
/usr/plugins/phonon_backend/libphonon_gstreamer.$(QT4_PLUGIN_EXT))
+# @$(call install_copy, qt4, 0, 0, 0644, \
+# $(QT4_DIR)/plugins/designer/libphononwidgets.$(QT4_PLUGIN_EXT),
\
+# /usr/plugins/designer/libphononwidgets.$(QT4_PLUGIN_EXT))
+endif
ifdef PTXCONF_QT4_FONT_DEJAVU
@for i in \
--
Markus Rathgeb
Public Key Server: http://wwwkeys.us.pgp.net/ bzw. hkp://wwwkeys.us.pgp.net/
Public Key Server: http://stinkfoot.org:11371/ bzw. hkp://stinkfoot.org
"Erst nachdem wir alles verloren haben, haben wir die Freiheit, alles zu tun."
"It's only after we've lost everything, that we're free to do anything!"
signature.asc
Description: This is a digitally signed message part.
-- ptxdist mailing list [email protected]
