package/kodi: Move all kodi packages to subdirectories of package/kodi/
PATCH 1/4 package/kodi: Move all kodi packages to subdirectories of package/kodi/
Kodi 15.0 Isengard will contain new support for binary addons. To prevent adding all those new packages to the root level of package/ introduce a new main hierarchy starting from package/kodi/.
This patch moves the current Kodi 14.2 Helix packages to this new directory in preparation for the upcoming version bump.
---
package/Config.in | 2 +-
package/{ => kodi}/kodi-addon-xvdr/0001-xbmc-rebrand.patch | 0
package/{ => kodi}/kodi-addon-xvdr/Config.in | 0
package/{ => kodi}/kodi-addon-xvdr/kodi-addon-xvdr.mk | 0
package/{ => kodi}/kodi-audioencoder-flac/Config.in | 0
.../kodi-audioencoder-flac/kodi-audioencoder-flac.mk | 0
package/{ => kodi}/kodi-audioencoder-lame/Config.in | 0
.../kodi-audioencoder-lame/kodi-audioencoder-lame.mk | 0
package/{ => kodi}/kodi-audioencoder-vorbis/Config.in | 0
.../kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk | 0
package/{ => kodi}/kodi-audioencoder-wav/Config.in | 0
.../kodi-audioencoder-wav/kodi-audioencoder-wav.mk | 0
package/{ => kodi}/kodi-pvr-addons/Config.in | 0
package/{ => kodi}/kodi-pvr-addons/kodi-pvr-addons.mk | 0
package/kodi/{ => }/kodi/0001-Fixup-include-path.patch | 0
package/kodi/{ => }/kodi/Config.in | 12 ++++++------
package/kodi/{ => }/kodi/S50kodi | 0
package/kodi/{ => }/kodi/br-kodi | 0
package/kodi/{ => }/kodi/kodi.mk | 6 +++---
package/kodi/{ => }/kodi/kodi.service | 0
20 files changed, 10 insertions(+), 10 deletions(-)
rename package/{ => kodi}/kodi-addon-xvdr/0001-xbmc-rebrand.patch (100%)
rename package/{ => kodi}/kodi-addon-xvdr/Config.in (100%)
rename package/{ => kodi}/kodi-addon-xvdr/kodi-addon-xvdr.mk (100%)
rename package/{ => kodi}/kodi-audioencoder-flac/Config.in (100%)
rename package/{ => kodi}/kodi-audioencoder-flac/kodi-audioencoder-flac.mk (100%)
rename package/{ => kodi}/kodi-audioencoder-lame/Config.in (100%)
rename package/{ => kodi}/kodi-audioencoder-lame/kodi-audioencoder-lame.mk (100%)
rename package/{ => kodi}/kodi-audioencoder-vorbis/Config.in (100%)
rename package/{ => kodi}/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk (100%)
rename package/{ => kodi}/kodi-audioencoder-wav/Config.in (100%)
rename package/{ => kodi}/kodi-audioencoder-wav/kodi-audioencoder-wav.mk (100%)
rename package/{ => kodi}/kodi-pvr-addons/Config.in (100%)
rename package/{ => kodi}/kodi-pvr-addons/kodi-pvr-addons.mk (100%)
rename package/kodi/{ => }/kodi/0001-Fixup-include-path.patch (100%)
rename package/kodi/{ => }/kodi/Config.in (95%)
rename package/kodi/{ => }/kodi/S50kodi (100%)
rename package/kodi/{ => }/kodi/br-kodi (100%)
rename package/kodi/{ => }/kodi/kodi.mk (98%)
rename package/kodi/{ => }/kodi/kodi.service (100%)package/Config.in +1 -1
@@ -16,7 +16,7 @@ menu "Audio and video applications" source "package/gstreamer/Config.in" source "package/gstreamer1/Config.in" source "package/jack2/Config.in" - source "package/kodi/Config.in" + source "package/kodi/kodi/Config.in" source "package/lame/Config.in" source "package/libvpx/Config.in" source "package/madplay/Config.in"
package/kodi/kodi-addon-xvdr/0001-xbmc-rebrand.patch renamed from package/kodi-addon-xvdr/0001-xbmc-rebrand.patch +0 -0
package/kodi/kodi-addon-xvdr/Config.in renamed from package/kodi-addon-xvdr/Config.in +0 -0
package/kodi/kodi-addon-xvdr/kodi-addon-xvdr.mk renamed from package/kodi-addon-xvdr/kodi-addon-xvdr.mk +0 -0
package/kodi/kodi-audioencoder-flac/Config.in renamed from package/kodi-audioencoder-flac/Config.in +0 -0
package/kodi/kodi-audioencoder-flac/kodi-audioencoder-flac.mk renamed from package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk +0 -0
package/kodi/kodi-audioencoder-lame/Config.in renamed from package/kodi-audioencoder-lame/Config.in +0 -0
package/kodi/kodi-audioencoder-lame/kodi-audioencoder-lame.mk renamed from package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk +0 -0
package/kodi/kodi-audioencoder-vorbis/Config.in renamed from package/kodi-audioencoder-vorbis/Config.in +0 -0
package/kodi/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk renamed from package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk +0 -0
package/kodi/kodi-audioencoder-wav/Config.in renamed from package/kodi-audioencoder-wav/Config.in +0 -0
package/kodi/kodi-audioencoder-wav/kodi-audioencoder-wav.mk renamed from package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk +0 -0
package/kodi/kodi-pvr-addons/Config.in renamed from package/kodi-pvr-addons/Config.in +0 -0
package/kodi/kodi-pvr-addons/kodi-pvr-addons.mk renamed from package/kodi-pvr-addons/kodi-pvr-addons.mk +0 -0
package/kodi/kodi/0001-Fixup-include-path.patch renamed from package/kodi/0001-Fixup-include-path.patch +0 -0
package/kodi/kodi/Config.in renamed from package/kodi/Config.in +6 -6
@@ -254,16 +254,16 @@ if BR2_PACKAGE_KODI_OPTICALDRIVE comment "Kodi audioencoder addons" -source "package/kodi-audioencoder-flac/Config.in" -source "package/kodi-audioencoder-lame/Config.in" -source "package/kodi-audioencoder-vorbis/Config.in" -source "package/kodi-audioencoder-wav/Config.in" +source "package/kodi/kodi-audioencoder-flac/Config.in" +source "package/kodi/kodi-audioencoder-lame/Config.in" +source "package/kodi/kodi-audioencoder-vorbis/Config.in" +source "package/kodi/kodi-audioencoder-wav/Config.in" endif # BR2_PACKAGE_KODI_OPTICALDRIVE comment "Kodi PVR addons" -source "package/kodi-addon-xvdr/Config.in" -source "package/kodi-pvr-addons/Config.in" +source "package/kodi/kodi-addon-xvdr/Config.in" +source "package/kodi/kodi-pvr-addons/Config.in" endif # BR2_PACKAGE_KODI
package/kodi/kodi/S50kodi renamed from package/kodi/S50kodi +0 -0
package/kodi/kodi/br-kodi renamed from package/kodi/br-kodi +0 -0
package/kodi/kodi/kodi.mk renamed from package/kodi/kodi.mk +3 -3
@@ -231,7 +231,7 @@ endef KODI_POST_INSTALL_TARGET_HOOKS += KODI_CLEAN_CONFLUENCE_SKIN define KODI_INSTALL_BR_WRAPPER - $(INSTALL) -D -m 0755 package/kodi/br-kodi \ + $(INSTALL) -D -m 0755 package/kodi/kodi/br-kodi \ $(TARGET_DIR)/usr/bin/br-kodi endef KODI_POST_INSTALL_TARGET_HOOKS += KODI_INSTALL_BR_WRAPPER
@@ -250,12 +250,12 @@ endef KODI_POST_INSTALL_TARGET_HOOKS += KODI_INSTALL_CONFIG_DIR define KODI_INSTALL_INIT_SYSV - $(INSTALL) -D -m 755 package/kodi/S50kodi \ + $(INSTALL) -D -m 755 package/kodi/kodi/S50kodi \ $(TARGET_DIR)/etc/init.d/S50kodi endef define KODI_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/kodi/kodi.service \ + $(INSTALL) -D -m 644 package/kodi/kodi/kodi.service \ $(TARGET_DIR)/usr/lib/systemd/system/kodi.service mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
package/kodi/kodi/kodi.service renamed from package/kodi/kodi.service +0 -0
Signature · 1 line
1.7.10.4
PATCH 2/4 package/kodi: Move all kodi packages to subdirectories of package/kodi/, part II
This patch needs to be squashed with the previous patch.
In this patch series it is presented as a seperate patch for easier review.
--- package/kodi/kodi.mk | 1 + 1 file changed, 1 insertion(+) create mode 100644 package/kodi/kodi.mk
package/kodi/kodi.mk new file +1 -0
@@ -0,0 +1 @@ +include $(sort $(wildcard package/kodi/*/*.mk))
Signature · 1 line
1.7.10.4
PATCH 3/4 package/kodi/kodi: Fix egl/gles compilation with mesa3d and disabled X.org
In reply to Bernd KuhlsIn this case -DMESA_EGL_NO_X11_HEADERS is needed during compilation.
Fixes this build error
make[1]: Entering directory `/home/fli4l/br8_kodi/output/build/kodi-14.2-Helix/xbmc/cores/dvdplayer'
CPP xbmc/cores/dvdplayer/DVDPlayerVideo.o
In file included from /home/fli4l/br8_kodi/output/host/usr/i586-buildroot-linux-uclibc/sysroot/usr/include/EGL/egl.h:36:0,
from /home/fli4l/br8_kodi/output/build/kodi-14.2-Helix/xbmc/windowing/egl/WinSystemEGL.h:28,
from /home/fli4l/br8_kodi/output/build/kodi-14.2-Helix/xbmc/windowing/WindowingFactory.h:39,
from DVDPlayerVideo.cpp:23:
/home/fli4l/br8_kodi/output/host/usr/i586-buildroot-linux-uclibc/sysroot/usr/include/EGL/eglplatform.h:118:22: fatal error: X11/Xlib.h: No such file or directory
#include <X11/Xlib.h>
^using this defconfig
BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_PACKAGE_KODI=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
BR2_PACKAGE_MESA3D_OPENGL_EGL=y
BR2_PACKAGE_MESA3D_OPENGL_ES=y
--- package/kodi/kodi/kodi.mk | 1 + 1 file changed, 1 insertion(+)
package/kodi/kodi/kodi.mk +1 -0
@@ -113,6 +113,7 @@ else KODI_CONF_OPTS += --disable-gl --disable-rsxs --disable-sdl --disable-x11 --disable-xrandr ifeq ($(BR2_PACKAGE_KODI_EGL_GLES),y) KODI_DEPENDENCIES += libegl libgles +KODI_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" KODI_CONF_OPTS += --enable-gles else KODI_CONF_OPTS += --disable-gles
Signature · 1 line
1.7.10.4
PATCH 3/4 package/kodi/kodi: Fix egl/gles compilation with mesa3d and disabled X.org
Bernd, All,
On 2015-06-14 11:10 +0200, Bernd Kuhls spake thusly:
Quoted 24 lines
In this case -DMESA_EGL_NO_X11_HEADERS is needed during compilation.
Fixes this build error
make[1]: Entering directory `/home/fli4l/br8_kodi/output/build/kodi-14.2-Helix/xbmc/cores/dvdplayer'
CPPxbmc/cores/dvdplayer/DVDPlayerVideo.o
In file included from/home/fli4l/br8_kodi/output/host/usr/i586-buildroot-linux-uclibc/sysroot/usr/include/EGL/egl.h:36:0,from /home/fli4l/br8_kodi/output/build/kodi-14.2-Helix/xbmc/windowing/egl/WinSystemEGL.h:28, from /home/fli4l/br8_kodi/output/build/kodi-14.2-Helix/xbmc/windowing/WindowingFactory.h:39, from DVDPlayerVideo.cpp:23: /home/fli4l/br8_kodi/output/host/usr/i586-buildroot-linux-uclibc/sysroot/usr/include/EGL/eglplatform.h:118:22: fatal error: X11/Xlib.h: No such file or directory #include <X11/Xlib.h> ^using this defconfig
BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_PACKAGE_KODI=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
BR2_PACKAGE_MESA3D_OPENGL_EGL=y
BR2_PACKAGE_MESA3D_OPENGL_ES=y
Quoted 1 line
Signed-off-by Bernd Kuhls <[email protected]>
Regards,
Yann E. MORIN.
Quoted 23 lines
--- package/kodi/kodi/kodi.mk | 1 + 1 file changed, 1 insertion(+)package/kodi/kodi/kodi.mk +1
-0@@ -113,6 +113,7 @@ else KODI_CONF_OPTS += --disable-gl --disable-rsxs --disable-sdl --disable-x11 --disable-xrandr ifeq ($(BR2_PACKAGE_KODI_EGL_GLES),y) KODI_DEPENDENCIES += libegl libgles +KODI_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" KODI_CONF_OPTS += --enable-gles else KODI_CONF_OPTS += --disable-glesSignature · 6 lines
1.7.10.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 4/4 package/kodi/kodi: Remove hyperflous option --disable-dvdcss
In reply to Bernd KuhlsThe option is controlled later on inside this if-clause
ifeq ($(BR2_PACKAGE_KODI_OPTICALDRIVE),y)
--- package/kodi/kodi/kodi.mk | 1 - 1 file changed, 1 deletion(-)
package/kodi/kodi/kodi.mk +0 -1
@@ -34,7 +34,6 @@ KODI_CONF_ENV = \ KODI_CONF_OPTS += \ --with-ffmpeg=shared \ --disable-crystalhd \ - --disable-dvdcss \ --disable-hal \ --disable-joystick \ --disable-openmax \
Signature · 1 line
1.7.10.4
PATCH 4/4 package/kodi/kodi: Remove hyperflous option --disable-dvdcss
Bernd, All,
On 2015-06-14 11:10 +0200, Bernd Kuhls spake thusly:
package/kodi/kodi/kodi.mk
Quoted 13 lines
The option is controlled later on inside this if-clause
ifeq ($(BR2_PACKAGE_KODI_OPTICALDRIVE),y)
Signed-off-by Bernd Kuhls <[email protected]>--- package/kodi/kodi/kodi.mk | 1 - 1 file changed, 1 deletion(-)package/kodi/kodi/kodi.mk +0
-0
This is not the correct layout we currently have in master.
Otherwise:
Regards,
Yann E. MORIN.
Quoted 15 lines
package/kodi/kodi/kodi.mk +0
-1@@ -34,7 +34,6 @@ KODI_CONF_ENV = \ KODI_CONF_OPTS += \ --with-ffmpeg=shared \ --disable-crystalhd \ - --disable-dvdcss \ --disable-hal \ --disable-joystick \ --disable-openmax \Signature · 6 lines
1.7.10.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/4 package/kodi: Move all kodi packages to subdirectories of package/kodi/
In reply to Bernd KuhlsDear Bernd Kuhls,
Quoted 8 lines · Bernd Kuhls
Kodi 15.0 Isengard will contain new support for binary addons. To prevent adding all those new packages to the root level of package/ introduce a new main hierarchy starting from package/kodi/.
This patch moves the current Kodi 14.2 Helix packages to this new directory in preparation for the upcoming version bump.
Signed-off-by Bernd Kuhls <[email protected]>
We went exactly the other way around recently with moving up all the matchbox packages back to package/ directory.
So, why would we want to do the opposite for Kodi ?
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/4 package/kodi: Move all kodi packages to subdirectories of package/kodi/
Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8 @public.gmane.org> wrote in news:20150614112249.5edc2e52 at free- electrons.com:
Quoted 2 lines
We went exactly the other way around recently with moving up all the matchbox packages back to package/ directory.
Hi,
ah, I did not notice that, so please regard my patch as suggestion, I was inspired by package/x11r7/ when preparing this patch. Currently my Kodi Isengard work directory looks like this:
$ find package/kodi/ -type d | sort package/kodi/ package/kodi/kodi package/kodi/kodi-audiodecoder-modplug package/kodi/kodi-audiodecoder-nosefart package/kodi/kodi-audiodecoder-sidplay package/kodi/kodi-audiodecoder-snesapu package/kodi/kodi-audiodecoder-stsound package/kodi/kodi-audiodecoder-timidity package/kodi/kodi-audiodecoder-vgmstream package/kodi/kodi-audioencoder-flac package/kodi/kodi-audioencoder-lame package/kodi/kodi-audioencoder-vorbis package/kodi/kodi-audioencoder-wav package/kodi/kodi-platform package/kodi/kodi-pvr-argustv package/kodi/kodi-pvr-dvblink package/kodi/kodi-pvr-dvbviewer package/kodi/kodi-pvr-filmon package/kodi/kodi-pvr-hts package/kodi/kodi-pvr-iptvsimple package/kodi/kodi-pvr-mediaportal-tvserver package/kodi/kodi-pvr-mythtv package/kodi/kodi-pvr-nextpvr package/kodi/kodi-pvr-njoy package/kodi/kodi-pvr-pctv package/kodi/kodi-pvr-stalker package/kodi/kodi-pvr-vbox package/kodi/kodi-pvr-vdr package/kodi/kodi-pvr-vuplus package/kodi/kodi-pvr-wmc package/kodi/kodi-screensaver-asteroids package/kodi/kodi-screensaver-biogenesis package/kodi/kodi-screensaver-crystalmorph package/kodi/kodi-screensaver-greynetic package/kodi/kodi-screensaver-pingpong package/kodi/kodi-screensaver-pyro package/kodi/kodi-screensaver-rsxs package/kodi/kodi-screensaver-stars package/kodi/kodi-visualisation-shadertoy
Is it ok for you to add all these packages to package/? Please note that
https://github.com/notspiff?tab=repositories
contains 12 more visualisation packages and ~5 more screensavers, not to mention ~12 more audiodecoders and lots of game.libretro package which I haven?t touched yet. This list is likely to grow to include addons from other sources after the release of Kodi 15.0 due to its new binary addons scheme.
Regards, Bernd
PATCH 1/4 package/kodi: Move all kodi packages to subdirectories of package/kodi/
Bernd Kuhls <[email protected]> wrote in news:XnsA4B97EE33FD2AberndkuhlsPkbjNfxxIA at bernd-kuhls.de:
Quoted 11 lines
Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8 @public.gmane.org> wrote in news:20150614112249.5edc2e52 at free- electrons.com:
Quoted 2 lines
We went exactly the other way around recently with moving up all the matchbox packages back to package/ directory.
Hi,
ah, I did not notice that, so please regard my patch as suggestion, I was inspired by package/x11r7/ when preparing this patch
Hi,
package/qt5/ also contains a lot of sub packages.
Regards, Bernd