On Sun, 2018-01-21 at 08:55 +0100, David Demelier wrote:
> On Sat, 2018-01-20 at 08:48 -0700, Wade Berrier wrote:
> > For what it's worth, I rebuilt kodi with dvd support about 2 weeks
> > ago
> > without issue.
> >
> > I installed the src.rpm, downloaded the referenced source urls
> > (kodi-libdvd-*.tar.gz), modified the .spec with:
> >
> > sed -i "s/_with_dvd 0/_with_dvd 1/g" kodi.spec
> >
> > and built with:
> >
> > rpmbuild -ba --with dvd kodi.spec
>
> Does --with dvd has any effect?
no, --with dvd will not work
> Because according to the RPM
> conditional builds feature the kodi.spec does not use
> %bcond_with(out)
> and the %{with dvd} macros.
>
> By the way, perhaps we could change this? :)
>
> I'm interested if possible.
Patches in attach , @Michael many I apply it ?
Best regards,
--
Sérgio M. B.From ed1e936e85f69238d7f92a5a31454f7e16d9d837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?=
Date: Tue, 23 Jan 2018 21:11:56 +
Subject: [PATCH 1/2] use bcond macro
---
kodi.spec | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/kodi.spec b/kodi.spec
index 1691e9c..76b375b 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -4,7 +4,7 @@
# use the line below for pre-releases
#global DIRVERSION %{version}%{PRERELEASE}
%global _hardened_build 1
-%global _with_dvd 0
+%bcond_with dvd
Name: kodi
Version: 17.6
@@ -24,7 +24,7 @@ Source0: %{name}-%{DIRVERSION}-patched.tar.xz
# ./kodi-generate-tarball-xz.sh
Source1: kodi-generate-tarball-xz.sh
-%if 0%{?_with_dvd}
+%if %{with dvd}
# kodi uses modified libdvd{css,nav,read} source and downloads at build time
# wget -O kodi-libdvdnav-master.tar.gz https://github.com/xbmc/libdvdnav/archive/master.tar.gz
Source2: kodi-libdvdnav-master.tar.gz
@@ -37,7 +37,7 @@ Source4: kodi-libdvdcss-master.tar.gz
# Set program version parameters
Patch1: kodi-16.0-versioning.patch
-%if 0%{?_with_dvd} == 0
+%if ! %{with dvd}
# Drop DVD library support
Patch2: kodi-17a2-libdvd.patch
%endif
@@ -260,7 +260,7 @@ library.
%prep
%setup -q -n %{name}-%{DIRVERSION}
%patch1 -p1 -b.versioning
-%if 0%{?_with_dvd}
+%if %{with dvd}
cp -p %{SOURCE2} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz
cp -p %{SOURCE3} tools/depends/target/libdvdread/libdvdread-master.tar.gz
cp -p %{SOURCE4} tools/depends/target/libdvdcss/libdvdcss-master.tar.gz
@@ -296,7 +296,7 @@ chmod +x bootstrap
%else
--disable-ssh \
%endif
-%if 0%{?_with_dvd} == 0
+%if ! %{with dvd}
--disable-optical-drive \
%endif
--disable-optimizations --disable-debug \
--
2.13.6
From ee87f56d4c424ca5292ae33d15ebb018874fd1fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?=
Date: Tue, 23 Jan 2018 21:13:17 +
Subject: [PATCH 2/2] Improve github urls.
---
kodi.spec | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/kodi.spec b/kodi.spec
index 76b375b..7a76d03 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -26,12 +26,9 @@ Source1: kodi-generate-tarball-xz.sh
%if %{with dvd}
# kodi uses modified libdvd{css,nav,read} source and downloads at build time
-# wget -O kodi-libdvdnav-master.tar.gz https://github.com/xbmc/libdvdnav/archive/master.tar.gz
-Source2: kodi-libdvdnav-master.tar.gz
-# wget -O kodi-libdvdread-master.tar.gz https://github.com/xbmc/libdvdread/archive/master.tar.gz
-Source3: kodi-libdvdread-master.tar.gz
-# wget -O kodi-libdvdcss-master.tar.gz https://github.com/xbmc/libdvdcss/archive/master.tar.gz
-Source4: kodi-libdvdcss-master.tar.gz
+Source2: https://github.com/xbmc/libdvdnav/archive/master/kodi-libdvdnav-master.tar.gz
+Source3: https://github.com/xbmc/libdvdread/archive/master/kodi-libdvdread-master.tar.gz
+Source4: https://github.com/xbmc/libdvdcss/archive/master/kodi-libdvdcss-master.tar.gz
%endif
# Set program version parameters
--
2.13.6
___
rpmfusion-users mailing list -- rpmfusion-users@lists.rpmfusion.org
To unsubscribe send an email to rpmfusion-users-le...@lists.rpmfusion.org
