summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2008-11-04 22:10:10 +0100
committerHolger Hans Peter Freyther <zecke@selfish.org>2008-11-04 22:10:10 +0100
commitc1401f7b1857e4dc00be14ce7d1aafd712ff5750 (patch)
tree868b4edb40f25d7053875f6f552734cfe74c0055 /conf
parent44a09d14b3b5637c4f4f7ee20d3504b52a1b949a (diff)
python-pygame: Blacklist smpeg and build pygame without smpeg
We can not build smpeg when enterprise is on. Put it into the BBMASK to make sure it is not buildable. Use base_conditional to not add the dependency to the DEPENDS when building for the enterprise branch. Remove the movie support (the one actually requiring smpeg) and only echo it into the Setup file when are not building with the ENTERPRISE_DISTRO flag. It seems to work both ways.
Diffstat (limited to 'conf')
-rw-r--r--conf/enterprise.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/enterprise.conf b/conf/enterprise.conf
index 79637661dd..5f89cb1c5e 100644
--- a/conf/enterprise.conf
+++ b/conf/enterprise.conf
@@ -1,2 +1,2 @@
# For the enterprise edition we want to avoid certain packages by default.
-BBMASK = "${@base_conditional('ENTERPRISE_DISTRO', '1', '(gst-plugins-ugly|mp3blaster|mpg123|mpg321|liba52|lame|libmad|mpeg2dec|xmms-mad|madplay|libsidplay|sidplayer|python-mad|opie-mediaplayer1-libmadplugin)', '', d)}"
+BBMASK = "${@base_conditional('ENTERPRISE_DISTRO', '1', '(gst-plugins-ugly|mp3blaster|mpg123|mpg321|smpeg|liba52|lame|libmad|mpeg2dec|xmms-mad|madplay|libsidplay|sidplayer|python-mad|opie-mediaplayer1-libmadplugin)', '', d)}"