diff options
author | Fathi Boudra <fabo@debian.org> | 2010-05-24 17:11:51 +0300 |
---|---|---|
committer | Fathi Boudra <fabo@debian.org> | 2010-05-24 17:11:51 +0300 |
commit | b0f8c980b3afb4f27635479053b31006afced054 (patch) | |
tree | 748fc8707286c47a753219bd8cb3f4f19a9a677a | |
parent | 55f3f5e1d75c95db6344a119f441b6b36063f4a7 (diff) | |
download | qt4-x11-b0f8c980b3afb4f27635479053b31006afced054.tar.gz |
add libgstreamer0.10-dev and libgstreamer-plugins-base0.10-dev build dependencies.
Update patch 10_config_tests_fixes.diff: fix gstreamer failure.
-rw-r--r-- | debian/changelog | 3 | ||||
-rw-r--r-- | debian/control | 1 | ||||
-rw-r--r-- | debian/patches/10_config_tests_fixes.diff | 9 |
3 files changed, 13 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 6993956..352d1bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,9 @@ qt4-x11 (4:4.7.0~beta1-1) UNRELEASED; urgency=low - 98_alpha_ftbfs_wtf_platform_support.diff - stolen upstream * Refresh Debian patches: - 30_webkit_unaligned_access.diff - partially merged upstream + * Update debian/control: + - add libgstreamer0.10-dev and libgstreamer-plugins-base0.10-dev build + dependencies. * Update debian/rules: - add -importdir configure option. * Update installed files. diff --git a/debian/control b/debian/control index 9706521..0467744 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 7.4.13), quilt, pkg-kde-tools (>= 0.6.4), flex, sha libasound2-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386], libaudio-dev, libcups2-dev, libdbus-1-dev, libfreetype6-dev, libgl1-mesa-dev | libgl-dev, libglib2.0-dev, libglu1-mesa-dev | libglu-dev, + libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libgtk2.0-dev, libice-dev, unixodbc-dev, libjpeg-dev, libmng-dev, libmysqlclient-dev, libpam0g-dev, libpng12-dev, libpq-dev, libreadline-dev, libsm-dev, libsqlite0-dev, libsqlite3-dev, libtiff4-dev, libx11-dev, diff --git a/debian/patches/10_config_tests_fixes.diff b/debian/patches/10_config_tests_fixes.diff index 63c4234..e088861 100644 --- a/debian/patches/10_config_tests_fixes.diff +++ b/debian/patches/10_config_tests_fixes.diff @@ -1,6 +1,8 @@ Description: Various config.test fixes. Build ibase sql plugin against firebird. + Add gstreamer include path. Author: Fathi Boudra <fabo@debian.org> +Last-Update: 2010-05-24 --- a/config.tests/unix/ibase/ibase.pro +++ b/config.tests/unix/ibase/ibase.pro @@ -39,3 +41,10 @@ Author: Fathi Boudra <fabo@debian.org> CONFIG -= qt dylib mac:CONFIG -= app_bundle +LIBS += -ldl +--- a/config.tests/unix/gstreamer/gstreamer.pro ++++ b/config.tests/unix/gstreamer/gstreamer.pro +@@ -1,3 +1,4 @@ + SOURCES = gstreamer.cpp + CONFIG -= qt + LIBS += -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10 ++INCLUDEPATH += /usr/include/gstreamer-0.10 |