Projects
home:sagiben
kodi
Sign Up
Log In
Username
Password
Problem getting expanded diff: bad link: conflict in file kodi.spec
×
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 76
View file
kodi-noX-raspberry-pi.changes
Changed
@@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 29 13:18:31 UTC 2016 - guillaume@opensuse.org + +- Remove SDL2 dep for kodi-noX* builds +- Rework again platform and player management + +------------------------------------------------------------------- Tue Jan 19 19:01:29 UTC 2016 - sagiben at gmail dot com - Merge Kenneth Perry change to re-enabled joystick support
View file
kodi-noX-raspberry-pi2.changes
Changed
@@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 29 13:18:31 UTC 2016 - guillaume@opensuse.org + +- Remove SDL2 dep for kodi-noX* builds +- Rework again platform and player management + +------------------------------------------------------------------- Tue Jan 19 19:01:29 UTC 2016 - sagiben at gmail dot com - Merge Kenneth Perry change to re-enabled joystick support
View file
kodi-noX.changes
Changed
@@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 29 13:18:31 UTC 2016 - guillaume@opensuse.org + +- Remove SDL2 dep for kodi-noX* builds +- Rework again platform and player management + +------------------------------------------------------------------- Tue Jan 19 19:01:29 UTC 2016 - sagiben at gmail dot com - Merge Kenneth Perry change to re-enabled joystick support
View file
kodi.changes
Changed
@@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 29 13:18:31 UTC 2016 - guillaume@opensuse.org + +- Remove SDL2 dep for kodi-noX* builds +- Rework again platform and player management + +------------------------------------------------------------------- Tue Jan 19 19:01:29 UTC 2016 - sagiben at gmail dot com - Merge Kenneth Perry change to re-enabled joystick support
View file
kodi-noX-raspberry-pi.spec
Changed
@@ -21,7 +21,7 @@ %define kodi_version Isengard %define _kodi_addons_dir %{_datadir}/kodi/addons # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center) -%define noX_build ("%{name}" == "kodi-noX") +%define noX_build 1 %if %{noX_build} # no X build needs openGL ES %bcond_with enable_opengl @@ -37,12 +37,7 @@ %endif %define kodi_platform raspberry-pi -%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2" -# Enable omxplayer for RPi and RPi2 %define kodi_player omxplayer -%else -%define kodi_player none -%endif Name: kodi-noX-raspberry-pi Version: 15.2 @@ -165,7 +160,9 @@ BuildRequires: pkgconfig(platform) BuildRequires: pkgconfig(python) BuildRequires: pkgconfig(samplerate) +%if !%{noX_build} BuildRequires: pkgconfig(sdl2) +%endif BuildRequires: pkgconfig(smbclient) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(taglib) >= 1.8 @@ -193,18 +190,18 @@ BuildRequires: pkgconfig(vdpau) %endif %if %{with enable_opengles} -%if %{kodi_platform} == "none" +%if "%{kodi_platform}" == "none" BuildRequires: Mesa-libEGL-devel BuildRequires: Mesa-libGLESv2-devel %else -%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2" +%if ("%{kodi_platform}" == "raspberry-pi") || ("%{kodi_platform}" == "raspberry-pi2") BuildRequires: raspberrypi-userland-devel %endif %endif %endif # Manage player deps %if %{kodi_player} == "omxplayer" -BuildRequires: omxplayer +Requires: omxplayer %endif # glxinfo is needed to check hw accel %if 0%{?suse_version} >= 1220 @@ -305,7 +302,7 @@ chmod +x bootstrap ./bootstrap -%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2" +%if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2" export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux" %endif %configure \ @@ -347,11 +344,11 @@ %else --disable-gles \ %endif -%if %{kodi_platform} != "none" +%if "%{kodi_platform}" != "none" --with-platform=%{kodi_platform} \ %endif -%if %{kodi_player} != "none" - --enable-player=%{kodi_player} \ +%if "%{kodi_player}" != "none" + --enable-player="%{kodi_player}" \ %endif %ifarch armv7l armv7hl --enable-tegra \
View file
kodi-noX-raspberry-pi2.spec
Changed
@@ -21,7 +21,7 @@ %define kodi_version Isengard %define _kodi_addons_dir %{_datadir}/kodi/addons # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center) -%define noX_build ("%{name}" == "kodi-noX") +%define noX_build 1 %if %{noX_build} # no X build needs openGL ES %bcond_with enable_opengl @@ -37,12 +37,7 @@ %endif %define kodi_platform raspberry-pi2 -%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2" -# Enable omxplayer for RPi and RPi2 %define kodi_player omxplayer -%else -%define kodi_player none -%endif Name: kodi-noX-raspberry-pi2 Version: 15.2 @@ -165,7 +160,9 @@ BuildRequires: pkgconfig(platform) BuildRequires: pkgconfig(python) BuildRequires: pkgconfig(samplerate) +%if !%{noX_build} BuildRequires: pkgconfig(sdl2) +%endif BuildRequires: pkgconfig(smbclient) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(taglib) >= 1.8 @@ -193,18 +190,18 @@ BuildRequires: pkgconfig(vdpau) %endif %if %{with enable_opengles} -%if %{kodi_platform} == "none" +%if "%{kodi_platform}" == "none" BuildRequires: Mesa-libEGL-devel BuildRequires: Mesa-libGLESv2-devel %else -%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2" +%if ("%{kodi_platform}" == "raspberry-pi") || ("%{kodi_platform}" == "raspberry-pi2") BuildRequires: raspberrypi-userland-devel %endif %endif %endif # Manage player deps %if %{kodi_player} == "omxplayer" -BuildRequires: omxplayer +Requires: omxplayer %endif # glxinfo is needed to check hw accel %if 0%{?suse_version} >= 1220 @@ -305,7 +302,7 @@ chmod +x bootstrap ./bootstrap -%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2" +%if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2" export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux" %endif %configure \ @@ -347,11 +344,11 @@ %else --disable-gles \ %endif -%if %{kodi_platform} != "none" +%if "%{kodi_platform}" != "none" --with-platform=%{kodi_platform} \ %endif -%if %{kodi_player} != "none" - --enable-player=%{kodi_player} \ +%if "%{kodi_player}" != "none" + --enable-player="%{kodi_player}" \ %endif %ifarch armv7l armv7hl --enable-tegra \
View file
kodi-noX.spec
Changed
@@ -21,7 +21,7 @@ %define kodi_version Isengard %define _kodi_addons_dir %{_datadir}/kodi/addons # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center) -%define noX_build ("%{name}" == "kodi-noX") +%define noX_build 1 %if %{noX_build} # no X build needs openGL ES %bcond_with enable_opengl @@ -37,12 +37,7 @@ %endif %define kodi_platform none -%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2" -# Enable omxplayer for RPi and RPi2 -%define kodi_player omxplayer -%else %define kodi_player none -%endif Name: kodi-noX Version: 15.2 @@ -165,7 +160,9 @@ BuildRequires: pkgconfig(platform) BuildRequires: pkgconfig(python) BuildRequires: pkgconfig(samplerate) +%if !%{noX_build} BuildRequires: pkgconfig(sdl2) +%endif BuildRequires: pkgconfig(smbclient) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(taglib) >= 1.8 @@ -193,18 +190,18 @@ BuildRequires: pkgconfig(vdpau) %endif %if %{with enable_opengles} -%if %{kodi_platform} == "none" +%if "%{kodi_platform}" == "none" BuildRequires: Mesa-libEGL-devel BuildRequires: Mesa-libGLESv2-devel %else -%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2" +%if ("%{kodi_platform}" == "raspberry-pi") || ("%{kodi_platform}" == "raspberry-pi2") BuildRequires: raspberrypi-userland-devel %endif %endif %endif # Manage player deps %if %{kodi_player} == "omxplayer" -BuildRequires: omxplayer +Requires: omxplayer %endif # glxinfo is needed to check hw accel %if 0%{?suse_version} >= 1220 @@ -305,7 +302,7 @@ chmod +x bootstrap ./bootstrap -%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2" +%if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2" export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux" %endif %configure \ @@ -347,11 +344,11 @@ %else --disable-gles \ %endif -%if %{kodi_platform} != "none" +%if "%{kodi_platform}" != "none" --with-platform=%{kodi_platform} \ %endif -%if %{kodi_player} != "none" - --enable-player=%{kodi_player} \ +%if "%{kodi_player}" != "none" + --enable-player="%{kodi_player}" \ %endif %ifarch armv7l armv7hl --enable-tegra \
View file
kodi.spec
Changed
@@ -21,7 +21,7 @@ %define kodi_version Isengard %define _kodi_addons_dir %{_datadir}/kodi/addons # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center) -%define noX_build ("%{name}" == "kodi-noX") +%define noX_build 0 %if %{noX_build} # no X build needs openGL ES %bcond_with enable_opengl @@ -37,12 +37,7 @@ %endif %define kodi_platform none -%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2" -# Enable omxplayer for RPi and RPi2 -%define kodi_player omxplayer -%else %define kodi_player none -%endif Name: kodi Version: 15.2 @@ -165,7 +160,9 @@ BuildRequires: pkgconfig(platform) BuildRequires: pkgconfig(python) BuildRequires: pkgconfig(samplerate) +%if !%{noX_build} BuildRequires: pkgconfig(sdl2) +%endif BuildRequires: pkgconfig(smbclient) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(taglib) >= 1.8 @@ -193,18 +190,18 @@ BuildRequires: pkgconfig(vdpau) %endif %if %{with enable_opengles} -%if %{kodi_platform} == "none" +%if "%{kodi_platform}" == "none" BuildRequires: Mesa-libEGL-devel BuildRequires: Mesa-libGLESv2-devel %else -%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2" +%if ("%{kodi_platform}" == "raspberry-pi") || ("%{kodi_platform}" == "raspberry-pi2") BuildRequires: raspberrypi-userland-devel %endif %endif %endif # Manage player deps %if %{kodi_player} == "omxplayer" -BuildRequires: omxplayer +Requires: omxplayer %endif # glxinfo is needed to check hw accel %if 0%{?suse_version} >= 1220 @@ -305,7 +302,7 @@ chmod +x bootstrap ./bootstrap -%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2" +%if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2" export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux" %endif %configure \ @@ -347,11 +344,11 @@ %else --disable-gles \ %endif -%if %{kodi_platform} != "none" +%if "%{kodi_platform}" != "none" --with-platform=%{kodi_platform} \ %endif -%if %{kodi_player} != "none" - --enable-player=%{kodi_player} \ +%if "%{kodi_player}" != "none" + --enable-player="%{kodi_player}" \ %endif %ifarch armv7l armv7hl --enable-tegra \
View file
_link
Changed
@@ -1,4 +1,4 @@ -<link project="Multimedia" baserev="43a990a6f0cc75abca68fd1f8d612433"> +<link project="Multimedia" baserev="8ca28ecf928facc3ed952c76f545cc74"> <patches> <branch/> </patches>
View file
pre_checkin.sh
Changed
@@ -1,7 +1,8 @@ #!/bin/bash # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from kodi.* files with this pre_checkin.sh script -sed -e 's/^Name:.*kodi/&-noX/' kodi.spec > kodi-noX.spec +sed -e 's/%define noX_build 0/%define noX_build 1/g + s/^Name:.*kodi/&-noX/' kodi.spec > kodi-noX.spec cp kodi.changes kodi-noX.changes # Kodi platforms @@ -13,7 +14,9 @@ for BOARDNAME in $armv6_platforms; do ARCH_RESTRICTIONS="armv6l armv6hl" # Not used for now # Enable platform build for the given platform (only noX version) - sed -e "s/%define kodi_platform none/%define kodi_platform $armv6_platforms/g + sed -e "s/%define noX_build 0/%define noX_build 1/g + s/%define kodi_platform none/%define kodi_platform $BOARDNAME/g + s/%define kodi_player none/%define kodi_player omxplayer/g s/^Name:.*kodi/&-noX-$BOARDNAME/" kodi.spec > kodi-noX-$BOARDNAME.spec cp kodi.changes kodi-noX-$BOARDNAME.changes done @@ -21,7 +24,9 @@ for BOARDNAME in $armv7_platforms; do ARCH_RESTRICTIONS="armv7l armv7hl" # Enable platform build for the given platform (only noX version) - sed -e "s/%define kodi_platform none/%define kodi_platform $armv7_platforms/g + sed -e "s/%define noX_build 0/%define noX_build 1/g + s/%define kodi_platform none/%define kodi_platform $BOARDNAME/g + s/%define kodi_player none/%define kodi_player omxplayer/g s/^Name:.*kodi/&-noX-$BOARDNAME/" kodi.spec > kodi-noX-$BOARDNAME.spec cp kodi.changes kodi-noX-$BOARDNAME.changes done
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.