[vdr-xineliboutput/f24: 2/2] Update to recent git version
by Martin Gansser
commit 7f17fb10aa83963810b17df53ef5173e8c9c3c6c
Merge: ecabeb0 ccef411
Author: Martin Gansser <mgansser(a)alice.de>
Date: Wed Feb 15 19:55:34 2017 +0100
Update to recent git version
.gitignore | 4 ++++
sources | 1 +
vdr-xineliboutput-1.1.0-29f7afd.tar.gz | Bin 412846 -> 0 bytes
vdr-xineliboutput.spec | 22 ++++++++++++----------
4 files changed, 17 insertions(+), 10 deletions(-)
---
7 years, 9 months
[vdr-xineliboutput] Update to recent git version
by Martin Gansser
commit ccef411d0577f38d82671faa73183e2cc2e258e1
Author: Martin Gansser <mgansser(a)alice.de>
Date: Wed Feb 15 19:50:57 2017 +0100
Update to recent git version
.gitignore | 1 +
sources | 2 +-
vdr-xineliboutput.spec | 22 ++++++++++++----------
3 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7b7e916..73349f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
vdr-xineliboutput-1.1.0-20150422.tgz
/vdr-xineliboutput-1.1.0-9027ea1.tar.gz
/vdr-xineliboutput-1.1.0-29f7afd.tar.gz
+/vdr-xineliboutput-1.1.0-71eefbe.tar.gz
diff --git a/sources b/sources
index e36ead8..58aa036 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-54de16cdb78c05db2b3a5287ad74ad30 vdr-xineliboutput-1.1.0-29f7afd.tar.gz
+80c8f46a1a5efda4e5cceff9f62a18e4 vdr-xineliboutput-1.1.0-71eefbe.tar.gz
diff --git a/vdr-xineliboutput.spec b/vdr-xineliboutput.spec
index 6601cd7..c775393 100644
--- a/vdr-xineliboutput.spec
+++ b/vdr-xineliboutput.spec
@@ -3,16 +3,15 @@
%global xinepluginver 2.0.0
%global pname xineliboutput
%global vdrver %(vdr-config --version 2>/dev/null || echo ERROR)
-%global gitrev 29f7afd
-%global gitdate 20160607
+%global gitrev 71eefbe
+%global gitdate 20170213
# build bluray support (disabled for now)
%global have_bluray 1
Name: vdr-%{pname}
Version: 1.1.0
-Release: 19.%{gitdate}git%{gitrev}%{?dist}
+Release: 20.%{gitdate}git%{gitrev}%{?dist}
Summary: Plugins for watching VDR over Xine
-
Group: Applications/Multimedia
License: GPLv2+
URL: http://sourceforge.net/projects/xineliboutput
@@ -106,12 +105,13 @@ install -dm 755 %{buildroot}%{_datadir}/vdr/xineliboutput
install -pm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/vdr-plugins.d/xineliboutput.conf
install -pm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/vdr/plugins/%{pname}/
-make install DESTDIR=%{buildroot}
+#make install DESTDIR=%{buildroot}
+%make_install
install -pm 755 mpg2c %{buildroot}%{_bindir}/mpg2c
-ln -s %{vdr_plugindir}/libxineliboutput-fbfe.so.%{xinepluginver}-cvs \
+ln -s %{vdr_plugindir}/libxineliboutput-fbfe.so.%{xinepluginver}-git \
%{buildroot}%{vdr_plugindir}/libxineliboutput-fbfe.so.%{xinepluginver}
-ln -s %{vdr_plugindir}/libxineliboutput-sxfe.so.%{xinepluginver}-cvs \
+ln -s %{vdr_plugindir}/libxineliboutput-sxfe.so.%{xinepluginver}-git \
%{buildroot}%{vdr_plugindir}/libxineliboutput-sxfe.so.%{xinepluginver}
install -pm 644 black_720x576.mpg %{buildroot}%{_sysconfdir}/vdr/plugins/%{pname}
install -pm 644 nosignal_720x576.mpg %{buildroot}%{_sysconfdir}/vdr/plugins/%{pname}
@@ -144,12 +144,14 @@ find %{buildroot}%{xineplugindir} -name '*.so' -exec chmod +x '{}' ';'
%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
%{vdr_plugindir}/libxineliboutput-fbfe.so.%{xinepluginver}
-%{vdr_plugindir}/libxineliboutput-fbfe.so.%{xinepluginver}-cvs
+%{vdr_plugindir}/libxineliboutput-fbfe.so.%{xinepluginver}-git
%{vdr_plugindir}/libxineliboutput-sxfe.so.%{xinepluginver}
-%{vdr_plugindir}/libxineliboutput-sxfe.so.%{xinepluginver}-cvs
-
+%{vdr_plugindir}/libxineliboutput-sxfe.so.%{xinepluginver}-git
%changelog
+* Wed Feb 15 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.0-20.20170213git71eefbe
+- Update to recent git version
+
* Sat Jan 28 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.0-19.20160607git29f7afd
- Update to recent git version
7 years, 9 months
[xorg-x11-drv-nvidia/f25: 5/5] Merge branch 'master' into f25
by Leigh Scott
commit f4ea70c8fabef9615c991b28e950e8f2edc47545
Merge: dc51e40 286375c
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Feb 15 16:34:28 2017 +0000
Merge branch 'master' into f25
.gitignore | 3 +++
sources | 6 +++---
xorg-x11-drv-nvidia.spec | 24 +++++++++++++++---------
3 files changed, 21 insertions(+), 12 deletions(-)
---
7 years, 9 months
[xorg-x11-drv-nvidia/f25] (5 commits) ...Merge branch 'master' into f25
by Leigh Scott
Summary of changes:
f63d823... Move mesa-*gl* requires to -libs (*)
e0c9a56... Enable boolean dependency to fix 32bit installation when ne (*)
3e44442... Bump cuda-drivers release to 100 (*)
286375c... Update to 375.39 release (*)
f4ea70c... Merge branch 'master' into f25
(*) This commit already existed in another branch; no separate mail sent
7 years, 9 months
[libva-intel-driver] Fix libva not working when using with libglvnd + wayland (rhbz#1422151)
by jwrdegoede
commit f59aa742507de2dfe9a0dbb9ca807c952fe49213
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Wed Feb 15 13:53:47 2017 +0100
Fix libva not working when using with libglvnd + wayland (rhbz#1422151)
libva-intel-driver-1.7.3-glvnd-fix.patch | 29 +++++++++++++++++++++++++++++
libva-intel-driver.spec | 11 ++++++++---
2 files changed, 37 insertions(+), 3 deletions(-)
---
diff --git a/libva-intel-driver-1.7.3-glvnd-fix.patch b/libva-intel-driver-1.7.3-glvnd-fix.patch
new file mode 100644
index 0000000..61d4d92
--- /dev/null
+++ b/libva-intel-driver-1.7.3-glvnd-fix.patch
@@ -0,0 +1,29 @@
+diff -up libva-intel-driver-1.7.3/src/i965_output_wayland.c~ libva-intel-driver-1.7.3/src/i965_output_wayland.c
+--- libva-intel-driver-1.7.3/src/i965_output_wayland.c~ 2016-11-10 01:37:13.000000000 +0100
++++ libva-intel-driver-1.7.3/src/i965_output_wayland.c 2017-02-15 10:58:25.288569428 +0100
+@@ -36,7 +36,10 @@
+ #include "i965_defines.h"
+ #include "dso_utils.h"
+
+-#define LIBEGL_NAME "libEGL.so.1"
++/* We need mesa's libEGL, first try the soname of a glvnd enabled mesa build */
++#define LIBEGL_NAME "libEGL_mesa.so.0"
++/* Then fallback to plain libEGL.so.1 (which might not be mesa) */
++#define LIBEGL_NAME_FALLBACK "libEGL.so.1"
+ #define LIBWAYLAND_CLIENT_NAME "libwayland-client.so.0"
+
+ typedef uint32_t (*wl_display_get_global_func)(struct wl_display *display,
+@@ -380,8 +383,11 @@ i965_output_wayland_init(VADriverContext
+ goto error;
+
+ i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME);
+- if (!i965->wl_output->libegl_handle)
+- goto error;
++ if (!i965->wl_output->libegl_handle) {
++ i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME_FALLBACK);
++ if (!i965->wl_output->libegl_handle)
++ goto error;
++ }
+
+ dso_handle = i965->wl_output->libegl_handle;
+ wl_vtable = &i965->wl_output->vtable;
diff --git a/libva-intel-driver.spec b/libva-intel-driver.spec
index 69e452f..0f9b2a2 100644
--- a/libva-intel-driver.spec
+++ b/libva-intel-driver.spec
@@ -2,12 +2,13 @@
Name: libva-intel-driver
Version: 1.7.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: HW video decode support for Intel integrated graphics
Group: System Environment/Libraries
License: MIT and EPL
URL: http://freedesktop.org/wiki/Software/vaapi
Source0: http://www.freedesktop.org/software/vaapi/releases/%{name}/%{name}-%{vers...
+Patch0: libva-intel-driver-1.7.3-glvnd-fix.patch
ExclusiveArch: %{ix86} x86_64 ia64
@@ -34,7 +35,7 @@ HW video decode support for Intel integrated graphics.
%prep
-%setup -q
+%autosetup -p1
%{?_with_gen4asm:
#Move pre-built (binary) asm code
for f in src/shaders/vme/*.g?b ; do
@@ -62,11 +63,15 @@ gendiff . .prebuilt
%files
-%doc AUTHORS COPYING NEWS README
+%doc AUTHORS NEWS README
+%license COPYING
%{_libdir}/dri/i965_drv_video.so
%changelog
+* Wed Feb 15 2017 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.7.3-2
+- Fix libva not working when using with libglvnd + wayland (rhbz#1422151)
+
* Thu Nov 10 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 1.7.3-1
- Update to 1.7.3
7 years, 9 months
[xtables-addons] Rebuild for iptables soname bump
by Leigh Scott
commit 030ef315163e72b3f4fdeeea389e5e50b9cbc6c0
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Feb 15 12:29:48 2017 +0000
Rebuild for iptables soname bump
xtables-addons.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/xtables-addons.spec b/xtables-addons.spec
index 4889c17..c375fe5 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -1,7 +1,7 @@
Name: xtables-addons
Summary: Extensions targets and matches for iptables
Version: 2.12
-Release: 1%{?dist}
+Release: 2%{?dist}
# The entire source code is GPLv2 except ACCOUNT/libxt_ACCOUNT_cl.* which is LGPLv2
License: GPLv2 and LGPLv2
Group: System Environment/Base
@@ -59,6 +59,9 @@ rm -f %{buildroot}%{_libdir}/*.{la,so}
%{_mandir}/man?/*
%changelog
+* Wed Feb 15 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.12-2
+- Rebuild for iptables soname bump
+
* Tue Jan 17 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2.12-1
- Update to 2.12
7 years, 9 months
[nvidia-304xx-kmod] remove disable mtrr patch
by Leigh Scott
commit 3fd58f4bbbf3706ed03c344426dd87ee025d5f4a
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Feb 15 09:52:27 2017 +0000
remove disable mtrr patch
nvidia-304xx-kmod.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/nvidia-304xx-kmod.spec b/nvidia-304xx-kmod.spec
index 53a496d..b31fba8 100644
--- a/nvidia-304xx-kmod.spec
+++ b/nvidia-304xx-kmod.spec
@@ -9,7 +9,7 @@
Name: nvidia-304xx-kmod
Version: 304.135
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -21,7 +21,7 @@ Source0: nvidia-kmod-data-%{version}.tar.xz
Source11: nvidia-304xx-kmodtool-excludekernel-filterfile
# https://anonscm.debian.org/viewvc/pkg-nvidia/packages/nvidia-graphics-dri...
-Patch0: disable-mtrr.patch
+#Patch0: disable-mtrr.patch
Patch1: 4.9.0_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,7 +49,7 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterf
for arch in x86 x64
do
pushd nvidiapkg-${arch}
-%patch0 -p0
+#patch0 -p0
%patch1 -p1
popd
done
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Feb 15 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 304.135-2
+- remove disable mtrr patch
+
* Wed Feb 15 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 304.135-1
- Update to 304.135
7 years, 9 months