diff options
| -rw-r--r-- | package/Config.in | 4 | ||||
| -rw-r--r-- | package/multimedia/Config.in | 2 | ||||
| -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 203767d33..2e842fb07 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 acbb2c43a..4568a51bb 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 894f65c6d..894f65c6d 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 800f43e8e..800f43e8e 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 d1305965b..d1305965b 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 90217a279..3f32bf627 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 c8faaa7c6..c8faaa7c6 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 e285fdaec..b448e9414 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)) |