[xine-ui] Add changelog entry
by Xavier Bachelot
commit 8a0c9c0c8f3f6a9935bd20b3085b4ccbfa726533
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Sat Aug 24 22:32:55 2019 +0200
Add changelog entry
xine-ui.spec | 7 +++++++
1 file changed, 7 insertions(+)
---
diff --git a/xine-ui.spec b/xine-ui.spec
index 9f2639d..a64a161 100644
--- a/xine-ui.spec
+++ b/xine-ui.spec
@@ -256,6 +256,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sat Aug 24 2019 Xavier Bachelot <xavier(a)bachelot.org> - 0.99.11-1.20190824hg894d90
+- Update to 0.99.11.
+- Move cacaxine and fbxine to aaxine subpackage.
+- Allow to build from snapshot.
+- Use %make_build and %make_install.
+- Re-order specfile preamble.
+
* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.99.10-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
4 years, 7 months
[xine-ui] Update to 0.99.11
by Xavier Bachelot
commit 9fb787979cb904743a0b6ffae02a82ba7837647a
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Sat Aug 24 21:59:20 2019 +0200
Update to 0.99.11
.gitignore | 1 +
sources | 2 +-
xine-ui-0.99.11-utf8doc.patch | 12 ++++++++++++
xine-ui-0.99.5-utf8doc.patch | 12 ------------
xine-ui.spec | 12 ++++++------
5 files changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 91df64d..bf9325b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ pitt.tar.gz
xine-ui-0.99.9.tar.xz
xinium.tar.gz
/xine-ui-0.99.10.tar.xz
+/xine-ui-0.99.11hg.tar.xz
diff --git a/sources b/sources
index 031fd73..61c9061 100644
--- a/sources
+++ b/sources
@@ -27,5 +27,5 @@ f16d6a1a39b32473a901d9132c405196 lcd.tar.gz
841924c042ca70700a9d201bc7686e59 mp2k.tar.gz
3023e8dd6c12902c32b3d99e51fd0c1e mplayer.tar.gz
7dd4e9e50e0145142982b0537c36f50a pitt.tar.gz
-b3b4839c73edfa0da7c7331455cfee29 xine-ui-0.99.10.tar.xz
+75ee819fee37d85a892d622f538eded7 xine-ui-0.99.11hg.tar.xz
9ebf98f4434a9fc119f0282806ba9c32 xinium.tar.gz
diff --git a/xine-ui-0.99.11-utf8doc.patch b/xine-ui-0.99.11-utf8doc.patch
new file mode 100644
index 0000000..3cb054f
--- /dev/null
+++ b/xine-ui-0.99.11-utf8doc.patch
@@ -0,0 +1,12 @@
+diff -aur xine-ui-0.99.11.orig/src/xitk/help.c xine-ui-0.99.11/src/xitk/help.c
+--- xine-ui-0.99.11.orig/src/xitk/help.c 2019-05-28 12:20:58.000000000 +0200
++++ xine-ui-0.99.11/src/xitk/help.c 2019-05-28 17:20:38.560009930 +0200
+@@ -180,7 +180,7 @@
+ help_add_section(locale_readme, lang->doc_encoding, order_num, section_name);
+ }
+ else {
+- help_add_section(default_readme, "ISO-8859-1", order_num, section_name);
++ help_add_section(default_readme, "UTF-8", order_num, section_name);
+ }
+ }
+ }
diff --git a/xine-ui.spec b/xine-ui.spec
index 67c7741..9f2639d 100644
--- a/xine-ui.spec
+++ b/xine-ui.spec
@@ -1,12 +1,12 @@
# TODO, sometime: nvtvsimple
-%global snapshot 0
-%global date 20190801
-%global commit 4176f3
+%global snapshot 1
+%global date 20190824
+%global commit 894d90
Name: xine-ui
-Version: 0.99.10
-Release: 7%{?snapshot:.%{date}hg%{commit}}%{?dist}
+Version: 0.99.11
+Release: 1%{?snapshot:.%{date}hg%{commit}}%{?dist}
Summary: A skinned xlib-based gui for xine-lib
License: GPLv2+
URL: http://www.xine-project.org/
@@ -53,7 +53,7 @@ Source31: default.ogv
Source100: make_xineui_snapshot.sh
# Patch to use UTF-8 documentation, BZ #512598
-Patch1: xine-ui-0.99.5-utf8doc.patch
+Patch1: xine-ui-0.99.11-utf8doc.patch
BuildRequires: aalib-devel >= 1.2.0
4 years, 7 months
[xine-ui] Allow to build from snapshot
by Xavier Bachelot
commit f5381985984c054e4c171082a7bf3cbaf55bf274
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Sat Aug 24 21:47:47 2019 +0200
Allow to build from snapshot
make_xineui_snapshot.sh | 20 ++++++++++++++++++++
xine-ui.spec | 27 ++++++++++++++-------------
2 files changed, 34 insertions(+), 13 deletions(-)
---
diff --git a/make_xineui_snapshot.sh b/make_xineui_snapshot.sh
new file mode 100644
index 0000000..6162066
--- /dev/null
+++ b/make_xineui_snapshot.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# This script is intended to make a xine-ui snapshot.
+# If no argument is provided, it will make a snapshot of HEAD.
+# If the svn revision is provided as an argument, it will make a snapshot of
+# this revision.
+
+TMPDIR=$(mktemp -d)
+pushd "$TMPDIR" || exit
+echo -n "Cloning xine-ui "
+[ -n "$1" ] && echo "revision $1" || echo "HEAD"
+[ -n "$1" ] && OPT="-u $1 " || OPT=""
+hg clone $OPT http://hg.code.sf.net/p/xine/xine-ui xine-ui
+cd xine-ui || exit
+autoreconf -vif
+./configure
+make dist
+popd || exit
+cp -p "$TMPDIR"/xine-ui/xine-ui-*.tar.xz .
+rm -rf "$TMPDIR"
diff --git a/xine-ui.spec b/xine-ui.spec
index 69376a9..67c7741 100644
--- a/xine-ui.spec
+++ b/xine-ui.spec
@@ -1,22 +1,20 @@
# TODO, sometime: nvtvsimple
-# hg version
-# %global hgdate 20091217
+%global snapshot 0
+%global date 20190801
+%global commit 4176f3
Name: xine-ui
Version: 0.99.10
-Release: 7%{?dist}
+Release: 7%{?snapshot:.%{date}hg%{commit}}%{?dist}
Summary: A skinned xlib-based gui for xine-lib
License: GPLv2+
URL: http://www.xine-project.org/
+%if ! 0%{?snapshot}
Source0: http://sourceforge.net/projects/xine/files/xine-ui/%{version}/xine-ui-%{v...
-#Use source from hg for now to fix a few bugs
-#This tarball has been created with
-# hg clone http://hg.debian.org/hg/xine-lib/xine-ui/ xine-ui-0.99.6
-# find xine-ui-0.99.6 -name .hg* -exec rm -rf {} \;
-# find xine-ui-0.99.6 -name .cvs* -exec rm -rf {} \;
-# tar jcf xine-ui-0.99.6-20091217.tar.bz2 xine-ui-0.99.6/
-# Source0: xine-ui-%{version}-%{hgdate}.tar.bz2
+%else
+Source0: xine-ui-%{version}hg.tar.xz
+%endif
# Sources for -skins.
Source1: http://xine-project.org/skins/Antares.tar.gz
@@ -51,6 +49,9 @@ Source29: http://xine-project.org/skins/Sunset.tar.gz
Source30: http://xine-project.org/skins/xinium.tar.gz
Source31: default.ogv
+# Script to make a xine-ui snapshot
+Source100: make_xineui_snapshot.sh
+
# Patch to use UTF-8 documentation, BZ #512598
Patch1: xine-ui-0.99.5-utf8doc.patch
@@ -116,11 +117,11 @@ It also contains the color ascii art and framebuffer versions.
%prep
# Setup xine
-%setup0 -q
+%setup -q -n %{name}-%{version}%{?snapshot:hg}
# Setup skins
-%setup1 -T -q -c -n %{name}-%{version}/fedoraskins -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30
+%setup1 -T -q -c -n %{name}-%{version}%{?snapshot:hg}/fedoraskins -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30
# Restore directory
-%setup -T -D
+%setup -T -D -n %{name}-%{version}%{?snapshot:hg}
%patch1 -p1
4 years, 7 months
[xine-ui] Use %make_build and %make_install
by Xavier Bachelot
commit acda877b3ca903c928a6b1668122e803192b9943
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Mon May 27 14:27:42 2019 +0200
Use %make_build and %make_install
xine-ui.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/xine-ui.spec b/xine-ui.spec
index 95c7911..69376a9 100644
--- a/xine-ui.spec
+++ b/xine-ui.spec
@@ -163,11 +163,11 @@ export LIRC_CFLAGS="-llirc_client"
export LIRC_LIBS="-llirc_client"
#%configure --disable-dependency-tracking --enable-vdr-keys --with-aalib XINE_DOCPATH=%{_docdir}/%{name}-%{version}
# Set documentation directory
-make %{?_smp_mflags}
+%make_build
%install
-make install DESTDIR=%{buildroot} INSTALL="install -p"
+%make_install
%find_lang 'xi\(ne-ui\|tk\)'
desktop-file-install --remove-category="Application" --vendor="" \
4 years, 7 months
[xine-ui] Re-order specfile preamble
by Xavier Bachelot
commit 95754edc755d8ffbca66346e7666c70e0a2b97b8
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Mon May 27 14:15:07 2019 +0200
Re-order specfile preamble
xine-ui.spec | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/xine-ui.spec b/xine-ui.spec
index 3a109e8..95c7911 100644
--- a/xine-ui.spec
+++ b/xine-ui.spec
@@ -3,15 +3,13 @@
# hg version
# %global hgdate 20091217
-Summary: A skinned xlib-based gui for xine-lib
Name: xine-ui
Version: 0.99.10
Release: 7%{?dist}
+Summary: A skinned xlib-based gui for xine-lib
License: GPLv2+
URL: http://www.xine-project.org/
-
Source0: http://sourceforge.net/projects/xine/files/xine-ui/%{version}/xine-ui-%{v...
-
#Use source from hg for now to fix a few bugs
#This tarball has been created with
# hg clone http://hg.debian.org/hg/xine-lib/xine-ui/ xine-ui-0.99.6
@@ -19,11 +17,6 @@ Source0: http://sourceforge.net/projects/xine/files/xine-ui/%{version}/xi
# find xine-ui-0.99.6 -name .cvs* -exec rm -rf {} \;
# tar jcf xine-ui-0.99.6-20091217.tar.bz2 xine-ui-0.99.6/
# Source0: xine-ui-%{version}-%{hgdate}.tar.bz2
-BuildRequires: autoconf
-BuildRequires: automake
-
-# Patch to use UTF-8 documentation, BZ #512598
-Patch1: xine-ui-0.99.5-utf8doc.patch
# Sources for -skins.
Source1: http://xine-project.org/skins/Antares.tar.gz
@@ -56,14 +49,15 @@ Source27: http://xine-project.org/skins/pitt.tar.gz
Source28: http://xine-project.org/skins/Polaris.tar.gz
Source29: http://xine-project.org/skins/Sunset.tar.gz
Source30: http://xine-project.org/skins/xinium.tar.gz
-
Source31: default.ogv
-# Package used to be named xine
-Provides: xine = %{version}-%{release}
-Obsoletes: xine < %{version}-%{release}
+# Patch to use UTF-8 documentation, BZ #512598
+Patch1: xine-ui-0.99.5-utf8doc.patch
+
BuildRequires: aalib-devel >= 1.2.0
+BuildRequires: autoconf
+BuildRequires: automake
BuildRequires: curl-devel >= 7.10.2
BuildRequires: desktop-file-utils
BuildRequires: gcc
@@ -89,6 +83,10 @@ Requires: hicolor-icon-theme
#
Requires: xine-lib-extras
+# Package used to be named xine
+Provides: xine = %{version}-%{release}
+Obsoletes: xine < %{version}-%{release}
+
%description
xine-ui is the traditional, skinned GUI for xine-lib.
4 years, 7 months
[xine-ui] Move cacaxine and fbxine to aaxine subpackage
by Xavier Bachelot
commit a83cbe56c832cc092056d24ca5cba3663f55d79c
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Mon May 27 14:08:38 2019 +0200
Move cacaxine and fbxine to aaxine subpackage
xine-ui.spec | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/xine-ui.spec b/xine-ui.spec
index d110f65..3a109e8 100644
--- a/xine-ui.spec
+++ b/xine-ui.spec
@@ -113,6 +113,7 @@ Requires: xine-lib-extras
%description aaxine
This package contains the ASCII art player for terminals like the vt100.
+It also contains the color ascii art and framebuffer versions.
%prep
@@ -220,8 +221,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f 'xi\(ne-ui\|tk\)'.lang
%license COPYING
%doc ChangeLog doc/README*
-%{_bindir}/cacaxine
-%{_bindir}/fbxine
%{_bindir}/xine
%{_bindir}/xine-remote
%dir %{_datadir}/xine/
@@ -249,6 +248,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files aaxine
%{_bindir}/aaxine
+%{_bindir}/cacaxine
+%{_bindir}/fbxine
%{_mandir}/man1/aaxine*
%lang(de) %{_mandir}/de/man1/aaxine*
%lang(es) %{_mandir}/es/man1/aaxine*
4 years, 7 months
[chromium-vaapi] Correct writting either RPM Fusion or rpmfusion
by Nicolas Chauvet
commit 4fb036358b4fa78bfcd502e3ae107224146ac5ad
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Sep 5 09:43:25 2019 +0200
Correct writting either RPM Fusion or rpmfusion
brand.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/brand.patch b/brand.patch
index 002c423..0a3e2f9 100644
--- a/brand.patch
+++ b/brand.patch
@@ -16,7 +16,7 @@ index 6278a8a38..1611b4c80 100644
</message>
<message name="IDS_VERSION_UI_UNOFFICIAL" desc="unofficial build on the about:version page">
- Developer Build
-+ RPMFusion Build
++ RPM Fusion Build
</message>
<message name="IDS_VERSION_UI_32BIT" desc="32-bit on the chrome://version page">
(32-bit)
4 years, 7 months
[kodi-inputstream-adaptive/f29] Update to 2.3.22
by Michael Cronenworth
commit 490c8d11f8c89ce66ffb2278c70c9ca2289b24e1
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Mon Sep 2 15:53:43 2019 -0500
Update to 2.3.22
kodi-inputstream-adaptive.spec | 12 ++++++++----
sources | 2 +-
2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/kodi-inputstream-adaptive.spec b/kodi-inputstream-adaptive.spec
index 2b46c67..cc83f95 100644
--- a/kodi-inputstream-adaptive.spec
+++ b/kodi-inputstream-adaptive.spec
@@ -1,16 +1,17 @@
%global aname inputstream.adaptive
%global kodi_version 18.0
+%global kodi_branch Leia
Name: kodi-inputstream-adaptive
-Version: 2.3.17
+Version: 2.3.22
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Adaptive file addon for Kodi's InputStream interface
Group: Applications/Multimedia
License: GPLv2+
URL: https://github.com/peak3d/inputstream.adaptive/
-Source0: https://github.com/peak3d/%{aname}/archive/%{version}/%{aname}-%{version}...
+Source0: https://github.com/peak3d/%{aname}/archive/%{version}-%{kodi_branch}/%{an...
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -27,7 +28,7 @@ ExcludeArch: %{power64} ppc64le
%{summary}.
%prep
-%autosetup -n %{aname}-%{version}
+%autosetup -n %{aname}-%{version}-%{kodi_branch}
# Fix spurious-executable-perm on debug package
find . -name '*.h' -or -name '*.cpp' | xargs chmod a-x
@@ -49,6 +50,9 @@ chmod 0755 $RPM_BUILD_ROOT%{_libdir}/kodi/addons/%{aname}/*.so
%{_datadir}/kodi/addons/%{aname}/
%changelog
+* Mon Sep 02 2019 Michael Cronenworth <mike(a)cchtml.com> - 2.3.22-1
+- Update to 2.3.22
+
* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.3.17-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources
index 21bcdf0..3053e73 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-811634d558d41c0520bbe33099d9b142 inputstream.adaptive-2.3.17.tar.gz
+5b57c75b5a87ae574385f9bda5bca4c5 inputstream.adaptive-2.3.22-Leia.tar.gz
4 years, 7 months
[kodi-inputstream-adaptive/f29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
by Michael Cronenworth
commit 83eb2efb2ec3f42e2596b0606233cf6ff8bce16e
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 9 18:02:19 2019 +0100
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Leigh Scott <leigh123linux(a)gmail.com>
kodi-inputstream-adaptive.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/kodi-inputstream-adaptive.spec b/kodi-inputstream-adaptive.spec
index fc5188c..2b46c67 100644
--- a/kodi-inputstream-adaptive.spec
+++ b/kodi-inputstream-adaptive.spec
@@ -4,7 +4,7 @@
Name: kodi-inputstream-adaptive
Version: 2.3.17
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Adaptive file addon for Kodi's InputStream interface
Group: Applications/Multimedia
@@ -49,6 +49,9 @@ chmod 0755 $RPM_BUILD_ROOT%{_libdir}/kodi/addons/%{aname}/*.so
%{_datadir}/kodi/addons/%{aname}/
%changelog
+* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.3.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
* Thu May 02 2019 Håkon Botnmark Jahre <haakobja(a)gmail.com> - 2.3.17-1
- Update to 2.3.17
4 years, 7 months
