From 306150ef73d241c4b89aaab214912e5453ab0dd3 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Mon, 13 Jun 2005 12:38:12 +0000 Subject: [PATCH] Clifford Wolf: Fixed some dependency problems: linux*, ogg-vorbis/speex, python, mplayer [2005053019555427772] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6099 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/linux/linux.conf | 6 ++++++ package/base/ogg-vorbis/ogg-vorbis.desc | 4 +++- package/base/python/parse-config | 3 +++ package/jimmy/mplayer/mplayer.conf | 3 +++ 4 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 package/base/python/parse-config diff --git a/package/base/linux/linux.conf b/package/base/linux/linux.conf index 857f48dad..188dc84dc 100644 --- a/package/base/linux/linux.conf +++ b/package/base/linux/linux.conf @@ -534,3 +534,9 @@ case "$pkg_linux_mode" in ;; esac +# ignore pseudo-deps to other modules +var_append flistrfilter "|" ".*lib/modules/.*/.*" + +# ignore some deps to basic system packages (avoiding false cyclic deps) +var_append flistrfilter "|" "net-tools:.*" + diff --git a/package/base/ogg-vorbis/ogg-vorbis.desc b/package/base/ogg-vorbis/ogg-vorbis.desc index 61be063a4..8195a6313 100644 --- a/package/base/ogg-vorbis/ogg-vorbis.desc +++ b/package/base/ogg-vorbis/ogg-vorbis.desc @@ -41,7 +41,9 @@ [L] GPL [S] Stable [V] 1.1.0 -[P] X -?---5---9 120.600 + +# rebuild in stage 6 because of cyclic dep with speex +[P] X -?---56--9 120.600 [SRC] lib tools diff --git a/package/base/python/parse-config b/package/base/python/parse-config new file mode 100644 index 000000000..4af36b023 --- /dev/null +++ b/package/base/python/parse-config @@ -0,0 +1,3 @@ + +var_append flistrfilter "|" ".*/lib/python.*\.pth" + diff --git a/package/jimmy/mplayer/mplayer.conf b/package/jimmy/mplayer/mplayer.conf index 4d2ebf269..f831d7241 100644 --- a/package/jimmy/mplayer/mplayer.conf +++ b/package/jimmy/mplayer/mplayer.conf @@ -102,3 +102,6 @@ var_append confopt " " "--enable-tv-v4l2 --enable-tv-v4l" hook_add premake 3 mplayer_premake hook_add postmake 5 mplayer_postmake + +var_append flistrfilter "|" "mplayer-fonts:.*" +