[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. 7368bfb2c382ed9549b4
From: |
Rob Savoye |
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. 7368bfb2c382ed9549b4e8f8279db6f05502ae68 |
Date: |
Mon, 04 Oct 2010 17:54:16 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 7368bfb2c382ed9549b4e8f8279db6f05502ae68 (commit)
via 19cc9be0f2dbbcdf152a4a9e0a3b5d3fe3883fdf (commit)
from 2336bcda55a47842b85569c11e94a83348fdcac7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=7368bfb2c382ed9549b4e8f8279db6f05502ae68
commit 7368bfb2c382ed9549b4e8f8279db6f05502ae68
Merge: 19cc9be 2336bcd
Author: Rob Savoye <address@hidden>
Date: Mon Oct 4 10:16:05 2010 -0600
Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash
http://git.savannah.gnu.org/cgit//commit/?id=19cc9be0f2dbbcdf152a4a9e0a3b5d3fe3883fdf
commit 19cc9be0f2dbbcdf152a4a9e0a3b5d3fe3883fdf
Author: Rob Savoye <address@hidden>
Date: Mon Oct 4 09:49:30 2010 -0600
fix typo in --enable-extensions
diff --git a/packaging/debian/rules b/packaging/debian/rules
index dc22c2b..aac4a15 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -82,8 +82,6 @@ ifneq (,$(findstring ogl,$(DEB_BUILD_OPTIONS)))
BUILD_DIRECTORY = _build.ogl
BUILD_DEBUG = -opengl
BUILD_VERSION = $(MAIN_VERSION).ogl.$(BUILD_VERSION)
-else
- BUILD_FLAGS += --enable-renderer=all
endif
# Optionally build an ffmpeg enabled package, Gstreamer is the default
@@ -99,7 +97,7 @@ else
BUILD_DEBUG = -ffmpeg
endif
else
- BUILD_FLAGS += --enable-media=gst
+ BUILD_FLAGS += --enable-media=gst,ffmpeg
endif
# Optionally build the older kde3 package, KDE4 is the default
@@ -118,15 +116,6 @@ else
BUILD_FLAGS += --enable-gui=gtk,kde4
endif
-# Optionally build an VA API enabled package, which is very experimental,
-# so it's not enabled by default.
-ifneq (,$(findstring vaapi,$(DEB_BUILD_OPTIONS)))
- BUILD_FLAGS += --enable-media=ffmpeg
- BUILD_DIRECTORY = _build.vaapi
- BUILD_VERSION = $(MAIN_VERSION).vaapi.$(BUILD_VERSION)
- BUILD_DEBUG = -vaapi
-endif
-
# Configure Gnash. We use a different set of options, as when building
# packages, we want to enable everything that Gnash can do, like
# python support, the SDK cygnal, etc... These are not enabled by
@@ -141,14 +130,14 @@ CONFIGURE_FLAGS = CFLAGS="$(CFLAGS)" \
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
+ --with-plugins-install=system \
+ --disable-dependency-tracking \
--disable-testsuite \
--disable-rpath \
- --enable-renderer=agg,cairo \
--enable-cygnal \
--enable-python \
- --with-plugins-install=system \
- --disable-dependency-tracking \
- --enable-extension=fileio,lirc,mysql \
+ --enable-renderer=agg,cairo \
+ --enable-extensions=fileio,lirc,mysql \
$(BUILD_FLAGS)
config: config-stamp
-----------------------------------------------------------------------
Summary of changes:
packaging/debian/rules | 21 +++++----------------
1 files changed, 5 insertions(+), 16 deletions(-)
hooks/post-receive
--
Gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. 7368bfb2c382ed9549b4e8f8279db6f05502ae68,
Rob Savoye <=