[xine-lib] Clean up and sort BuildRequires
by Xavier Bachelot
commit d3175d621d739161f8fa139c8de44f8bf4d5c710
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Fri May 17 15:14:54 2019 +0200
Clean up and sort BuildRequires
xine-lib.spec | 96 ++++++++++++++++++++++++++---------------------------------
1 file changed, 43 insertions(+), 53 deletions(-)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index ae7a8ed..5b3066e 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -33,70 +33,59 @@ Provides: xine-lib(plugin-abi) = %{plugin_abi}
Obsoletes: xine-lib-extras-freeworld < 1.1.21-10
Provides: xine-lib-extras-freeworld = %{version}-%{release}
-BuildRequires: gcc
-%{?el7:BuildRequires: epel-rpm-macros}
-BuildRequires: gettext-devel
-# X11
-BuildRequires: libX11-devel
-BuildRequires: libXv-devel
-BuildRequires: libXt-devel
-BuildRequires: libXext-devel
-BuildRequires: libXinerama-devel
-BuildRequires: libXvMC-devel
-BuildRequires: libGLU-devel
-BuildRequires: libv4l-devel
-BuildRequires: libxcb-devel
-BuildRequires: libva-devel
-BuildRequires: libvdpau-devel
-BuildRequires: mesa-libEGL-devel
-# Video
-BuildRequires: SDL-devel
-BuildRequires: libtheora-devel
-BuildRequires: libmng-devel
-BuildRequires: aalib-devel >= 1.4
-BuildRequires: libcaca-devel >= 0.99-0.5.beta14
-BuildRequires: ImageMagick-devel >= 6.2.4.6-1
-BuildRequires: libvpx-devel
-# Not available on EL6 and EL7
-%if 0%{?fedora}
-BuildRequires: libaom-devel
-%endif
-%{?_with_rpi:BuildRequires: raspberrypi-vc-devel}
-%if 0%{?_with_freetype:1}
-BuildRequires: fontconfig-devel
-%endif # freetype
-# Audio
-BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804
BuildRequires: a52dec-devel
-BuildRequires: alsa-lib-devel >= 0.9.0
+BuildRequires: aalib-devel
+BuildRequires: alsa-lib-devel
BuildRequires: faad2-devel
+BuildRequires: ffmpeg-devel
BuildRequires: flac-devel
+%{?_with_freetype:BuildRequires: fontconfig-devel}
+BuildRequires: gcc
+BuildRequires: gettext-devel
+BuildRequires: gnutls-devel
+BuildRequires: gtk2-devel
+BuildRequires: ImageMagick-devel
BuildRequires: jack-audio-connection-kit-devel
+# Not available on EL6 and EL7
+%{?fedora:BuildRequires: libaom-devel}
+# libbluray is too old on EL6
+%{!?el6:BuildRequires: libbluray-devel}
+BuildRequires: libcaca-devel
+BuildRequires: libcdio-devel
BuildRequires: libdca-devel
+BuildRequires: libdvdnav-devel
+BuildRequires: libdvdread-devel
+BuildRequires: libfame-devel
+BuildRequires: libGLU-devel
BuildRequires: libmad-devel
+BuildRequires: libmng-devel
BuildRequires: libmodplug-devel
BuildRequires: libmpcdec-devel
-BuildRequires: libvorbis-devel
-BuildRequires: speex-devel
-BuildRequires: wavpack-devel
-# CDs / DVDs
-BuildRequires: libcdio-devel
-BuildRequires: vcdimager-devel >= 0.7.23
-BuildRequires: libdvdnav-devel
-BuildRequires: libdvdread-devel
-# libbluray is too old on EL6
-%{!?el6:BuildRequires: libbluray-devel}
-# Other
-BuildRequires: pkgconfig
-BuildRequires: pkgconfig(libpulse)
-BuildRequires: gtk2-devel
+BuildRequires: libnfs-devel
BuildRequires: libsmbclient-devel
-BuildRequires: libtool
BuildRequires: libssh2-devel
-BuildRequires: libnfs-devel
-BuildRequires: gnutls-devel
+BuildRequires: libtheora-devel
+BuildRequires: libtool
+BuildRequires: libv4l-devel
+BuildRequires: libva-devel
+BuildRequires: libvdpau-devel
+BuildRequires: libvorbis-devel
+BuildRequires: libvpx-devel
+BuildRequires: libX11-devel
+BuildRequires: libxcb-devel
+BuildRequires: libXext-devel
+BuildRequires: libXinerama-devel
+BuildRequires: libXt-devel
+BuildRequires: libXv-devel
+BuildRequires: libXvMC-devel
+BuildRequires: mesa-libEGL-devel
BuildRequires: openssl-devel
-BuildRequires: libfame-devel
+BuildRequires: pkgconfig(libpulse)
+%{?_with_rpi:BuildRequires: raspberrypi-vc-devel}
+BuildRequires: SDL-devel
+BuildRequires: speex-devel
+BuildRequires: vcdimager-devel
+BuildRequires: wavpack-devel
%description
@@ -340,6 +329,7 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir}
- Enable EGL support.
- Enable mpeg2 encoding support for dxr3.
- Don't glob soname.
+- Clean up and sort BuildRequires.
* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.2.9-13.20181129hg14263
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 6 months
[xine-lib] Don't glob soname
by Xavier Bachelot
commit 023798a4e27b450922ed52c9cff7f4ebca003efd
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Wed May 15 18:05:01 2019 +0200
Don't glob soname
xine-lib.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index 91f4a7c..ae7a8ed 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -191,7 +191,7 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir}
%license COPYING COPYING.LIB
%dir %{codecdir}/
%{_datadir}/xine-lib/
-%{_libdir}/libxine.so.*
+%{_libdir}/libxine.so.2*
%{_mandir}/man5/xine.5*
%dir %{_libdir}/xine/
%dir %{_libdir}/xine/plugins/
@@ -339,6 +339,7 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir}
- Add script to make a snapshot.
- Enable EGL support.
- Enable mpeg2 encoding support for dxr3.
+- Don't glob soname.
* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.2.9-13.20181129hg14263
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 6 months
[xine-lib] Enable mpeg2 encoding support for dxr3
by Xavier Bachelot
commit fd0714de1620262387ba4b08d8fb90d6880204a0
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Wed May 15 10:51:46 2019 +0200
Enable mpeg2 encoding support for dxr3
xine-lib.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index 17f5ec7..91f4a7c 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -96,6 +96,7 @@ BuildRequires: libssh2-devel
BuildRequires: libnfs-devel
BuildRequires: gnutls-devel
BuildRequires: openssl-devel
+BuildRequires: libfame-devel
%description
@@ -337,6 +338,7 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir}
- Update to xine-lib snapshot.
- Add script to make a snapshot.
- Enable EGL support.
+- Enable mpeg2 encoding support for dxr3.
* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.2.9-13.20181129hg14263
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 6 months
[xine-lib] Enable EGL support
by Xavier Bachelot
commit 1e8c3f361d20b238f062a3b9127f22e185a39938
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Mon May 13 16:54:45 2019 +0200
Enable EGL support
xine-lib.spec | 4 ++++
1 file changed, 4 insertions(+)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index bc6463c..17f5ec7 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -48,6 +48,7 @@ BuildRequires: libv4l-devel
BuildRequires: libxcb-devel
BuildRequires: libva-devel
BuildRequires: libvdpau-devel
+BuildRequires: mesa-libEGL-devel
# Video
BuildRequires: SDL-devel
BuildRequires: libtheora-devel
@@ -290,6 +291,8 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_fb.so
%{?_with_rpi:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_mmal.so}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_gl_glx.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_gl_egl_x11.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_gl_egl_wl.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_opengl.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_opengl2.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_raw.so
@@ -333,6 +336,7 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir}
* Fri May 17 2019 Xavier Bachelot <xavier(a)bachelot.org> 1.2.9-14.20190516hg14396
- Update to xine-lib snapshot.
- Add script to make a snapshot.
+- Enable EGL support.
* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.2.9-13.20181129hg14263
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 6 months
[xine-lib] Add script to make a snapshot
by Xavier Bachelot
commit fa8cffccf32344baac5ee0298ac16570847a8046
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Wed May 15 10:24:24 2019 +0200
Add script to make a snapshot
make_xinelib_snapshot.sh | 20 ++++++++++++++++++++
xine-lib.spec | 8 +++-----
2 files changed, 23 insertions(+), 5 deletions(-)
---
diff --git a/make_xinelib_snapshot.sh b/make_xinelib_snapshot.sh
new file mode 100644
index 0000000..c802a01
--- /dev/null
+++ b/make_xinelib_snapshot.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# This script is intended to make a xine-lib 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-lib-1.2 "
+[ -n "$1" ] && echo "revision $1" || echo "HEAD"
+[ -n "$1" ] && OPT="-u $1 " || OPT=""
+hg clone $OPT http://hg.code.sf.net/p/xine/xine-lib-1.2 xine-lib-1.2
+cd xine-lib-1.2 || exit
+autoreconf -vif
+./configure
+make dist
+popd || exit
+cp -p "$TMPDIR"/xine-lib-1.2/xine-lib-1.2*.tar.xz .
+rm -rf "$TMPDIR"
diff --git a/xine-lib.spec b/xine-lib.spec
index 90751ca..bc6463c 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -22,13 +22,10 @@ URL: http://www.xine-project.org/
%if ! 0%{?snapshot}
Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.xz
%else
-#hg clone http://hg.code.sf.net/p/xine/xine-lib-1.2 xine-lib-1.2
-#cd xine-lib-1.2
-#autoreconf -vif
-#./configure
-#make dist
Source0: xine-lib-%{version}-%{date}hg%{revision}.tar.xz
%endif
+# Script to make a snapshot
+Source1: make_xinelib_snapshot.sh
Provides: xine-lib(plugin-abi) = %{plugin_abi}
%{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}}
@@ -335,6 +332,7 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir}
%changelog
* Fri May 17 2019 Xavier Bachelot <xavier(a)bachelot.org> 1.2.9-14.20190516hg14396
- Update to xine-lib snapshot.
+- Add script to make a snapshot.
* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.2.9-13.20181129hg14263
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 6 months
[xine-lib] Update snapshot
by Xavier Bachelot
commit 53dc45d8c917cfba1422bfbc818eac06b59583a4
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Mon May 13 16:52:57 2019 +0200
Update snapshot
.gitignore | 1 +
sources | 2 +-
xine-lib.spec | 10 +++++++---
3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 191a789..4e4fc9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ xine-lib-1.2.6.tar.xz
/xine-lib-1.2.8.tar.xz
/xine-lib-1.2.9.tar.xz
/xine-lib-1.2.9-20181129hg14263.tar.xz
+/xine-lib-1.2.9-20190516hg14396.tar.xz
diff --git a/sources b/sources
index c4b4923..572f01a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03645249641c5c268ccb46de96670634 xine-lib-1.2.9-20181129hg14263.tar.xz
+87664bbddaa8f9f071e30b6d1d8f8ade xine-lib-1.2.9-20190516hg14396.tar.xz
diff --git a/xine-lib.spec b/xine-lib.spec
index 426b939..90751ca 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -10,13 +10,13 @@
%endif # ix86
%global snapshot 1
-%global date 20181129
-%global revision 14263
+%global date 20190516
+%global revision 14396
Summary: A multimedia engine
Name: xine-lib
Version: 1.2.9
-Release: 13%{?snapshot:.%{date}hg%{revision}}%{?dist}
+Release: 14%{?snapshot:.%{date}hg%{revision}}%{?dist}
License: GPLv2+
URL: http://www.xine-project.org/
%if ! 0%{?snapshot}
@@ -292,6 +292,7 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vdr.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_fb.so
%{?_with_rpi:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_mmal.so}
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_gl_glx.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_opengl.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_opengl2.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_raw.so
@@ -332,6 +333,9 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir}
%changelog
+* Fri May 17 2019 Xavier Bachelot <xavier(a)bachelot.org> 1.2.9-14.20190516hg14396
+- Update to xine-lib snapshot.
+
* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.2.9-13.20181129hg14263
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 6 months
[xroar/f29] Updated to 0.35.4
by Andrea Musuruane
Summary of changes:
6baaaca... Updated to 0.35.4 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 6 months
[xroar/f30] Updated to 0.35.4
by Andrea Musuruane
Summary of changes:
6baaaca... Updated to 0.35.4 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 6 months
[xroar] Updated to 0.35.4
by Andrea Musuruane
commit 6baaacaad447b8189c92c891d51616256dc26db9
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Tue May 21 10:26:58 2019 +0200
Updated to 0.35.4
.gitignore | 1 +
sources | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/.gitignore b/.gitignore
index bc2c483..1c259e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ dragon.rom
/xroar-0.35.1.tar.gz
/xroar-0.35.2.tar.gz
/xroar-0.35.3.tar.gz
+/xroar-0.35.4.tar.gz
diff --git a/sources b/sources
index acfdb44..a5f204a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
f8b5f52c07abb4dc9102d8420605d7e4 dragon.rom
-d7820c0f4155c04f37f388c1510d3ab5 xroar-0.35.3.tar.gz
+072fb6c260840ff6e6f12083a4907939 xroar-0.35.4.tar.gz
5 years, 6 months
[nvidia-kmod/el8: 2/2] Merge branch 'master' into el8
by Leigh Scott
commit 9a0cc6909af6330bc447517c4fb3ea48d721cab2
Merge: f4f76cf 55433dc
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue May 21 09:19:00 2019 +0100
Merge branch 'master' into el8
nvidia-kmod.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
5 years, 6 months
