aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <jacmet@sunsite.dk>2008-11-15 21:33:14 +0000
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2008-11-15 21:33:14 +0000
commit50f2a3981fb5e7988bac4fb231286ae69055458f (patch)
tree6bc7792aa516c5d7b65df8a8bf873d3a37ed4d59
parente7df5afeb9634a0d95499049efb5c4887069290d (diff)
downloadbuildroot-50f2a3981fb5e7988bac4fb231286ae69055458f.tar.gz
buildroot-50f2a3981fb5e7988bac4fb231286ae69055458f.tar.bz2
mplayer, vlc: move into multimedia category
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
-rw-r--r--package/Config.in4
-rw-r--r--package/multimedia/Config.in2
-rw-r--r--package/multimedia/mplayer/Config.in (renamed from package/mplayer/Config.in)0
-rw-r--r--package/multimedia/mplayer/mplayer-1.0rc1-atmel.3.patch (renamed from package/mplayer/mplayer-1.0rc1-atmel.3.patch)0
-rw-r--r--package/multimedia/mplayer/mplayer-1.0rc1-index.patch (renamed from package/mplayer/mplayer-1.0rc1-index.patch)0
-rw-r--r--package/multimedia/mplayer/mplayer.mk (renamed from package/mplayer/mplayer.mk)2
-rw-r--r--package/multimedia/vlc/Config.in (renamed from package/vlc/Config.in)0
-rw-r--r--package/multimedia/vlc/vlc.mk (renamed from package/vlc/vlc.mk)2
8 files changed, 4 insertions, 6 deletions
diff --git a/package/Config.in b/package/Config.in
index 203767d33d..2e842fb077 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -381,10 +381,6 @@ source "package/x11vnc/Config.in"
source "package/xpdf/Config.in"
source "package/xstroke/Config.in"
source "package/xvkbd/Config.in"
-
-comment "Video libraries/codecs and applications"
-source "package/mplayer/Config.in"
-source "package/vlc/Config.in"
endmenu
menu "Compressors / decompressors"
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index acbb2c43a2..4568a51bb2 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -10,6 +10,8 @@ source "package/multimedia/libsndfile/Config.in"
source "package/multimedia/libvorbis/Config.in"
source "package/multimedia/madplay/Config.in"
source "package/multimedia/mpg123/Config.in"
+source "package/multimedia/mplayer/Config.in"
source "package/multimedia/speex/Config.in"
source "package/multimedia/festival/Config.in"
+source "package/multimedia/vlc/Config.in"
endmenu
diff --git a/package/mplayer/Config.in b/package/multimedia/mplayer/Config.in
index 894f65c6de..894f65c6de 100644
--- a/package/mplayer/Config.in
+++ b/package/multimedia/mplayer/Config.in
diff --git a/package/mplayer/mplayer-1.0rc1-atmel.3.patch b/package/multimedia/mplayer/mplayer-1.0rc1-atmel.3.patch
index 800f43e8eb..800f43e8eb 100644
--- a/package/mplayer/mplayer-1.0rc1-atmel.3.patch
+++ b/package/multimedia/mplayer/mplayer-1.0rc1-atmel.3.patch
diff --git a/package/mplayer/mplayer-1.0rc1-index.patch b/package/multimedia/mplayer/mplayer-1.0rc1-index.patch
index d1305965b4..d1305965b4 100644
--- a/package/mplayer/mplayer-1.0rc1-index.patch
+++ b/package/multimedia/mplayer/mplayer-1.0rc1-index.patch
diff --git a/package/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 90217a2797..3f32bf627e 100644
--- a/package/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -22,7 +22,7 @@ $(DL_DIR)/$(MPLAYER_SOURCE):
$(MPLAYER_DIR)/.unpacked: $(DL_DIR)/$(MPLAYER_SOURCE)
$(MPLAYER_CAT) $(DL_DIR)/$(MPLAYER_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(MPLAYER_DIR) package/mplayer/ mplayer-$(MPLAYER_VERSION)\*.patch\*
+ toolchain/patch-kernel.sh $(MPLAYER_DIR) package/multimedia/mplayer/ mplayer-$(MPLAYER_VERSION)\*.patch\*
$(CONFIG_UPDATE) $(MPLAYER_DIR)
touch $@
diff --git a/package/vlc/Config.in b/package/multimedia/vlc/Config.in
index c8faaa7c68..c8faaa7c68 100644
--- a/package/vlc/Config.in
+++ b/package/multimedia/vlc/Config.in
diff --git a/package/vlc/vlc.mk b/package/multimedia/vlc/vlc.mk
index e285fdaec9..b448e94145 100644
--- a/package/vlc/vlc.mk
+++ b/package/multimedia/vlc/vlc.mk
@@ -14,5 +14,5 @@ VLC_CONF_OPT =
VLC_DEPENDENCIES = uclibc
-$(eval $(call AUTOTARGETS,package,vlc))
+$(eval $(call AUTOTARGETS,package/multimedia,vlc))