[nvidia-340xx-kmod] Update to 340.98
by Leigh Scott
commit 48ade175ec0edfd8976467af4f02b355f2ad381d
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Sep 27 09:53:01 2016 +0100
Update to 340.98
linux-4.6.patch | 150 -------------------------------------------------
nvidia-340xx-kmod.spec | 9 +--
2 files changed, 5 insertions(+), 154 deletions(-)
---
diff --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec
index 6508349..8276713 100644
--- a/nvidia-340xx-kmod.spec
+++ b/nvidia-340xx-kmod.spec
@@ -8,9 +8,9 @@
Name: nvidia-340xx-kmod
Epoch: 1
-Version: 340.96
+Version: 340.98
# Taken over by kmodtool
-Release: 4%{?dist}
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -18,7 +18,6 @@ URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
-Patch1: linux-4.6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -47,7 +46,6 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterf
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz
# patch loop
%patch0 -p1
-%patch1 -p1
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -95,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Sep 27 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:340.98-1
+- Update to 340.98
+
* Sun Jul 24 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:340.96-4
- switch to akmod build
8 years, 1 month
[xorg-x11-drv-nvidia-340xx/f23] (3 commits) ...Update to 340.98
by Leigh Scott
Summary of changes:
553efbe... Attempt to fix build on armhfp - disabled for now (*)
a5117fb... Attempt to fix build on armhfp - disabled for now (*)
45578ca... Update to 340.98 (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 1 month
[xorg-x11-drv-nvidia-340xx] Update to 340.98
by Leigh Scott
commit 45578ca016eb80a9b2c65859843f3d2c3ecbb61d
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Sep 27 09:23:15 2016 +0100
Update to 340.98
.gitignore | 3 +++
sources | 6 +++---
xorg-x11-drv-nvidia-340xx.spec | 7 +++++--
3 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e489859..eb6a529 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
NVIDIA-Linux-x86-340.93.run
NVIDIA-Linux-x86_64-340.93.run
NVIDIA-Linux-armv7l-gnueabihf-340.93.run
+/NVIDIA-Linux-armv7l-gnueabihf-340.98.run
+/NVIDIA-Linux-x86-340.98.run
+/NVIDIA-Linux-x86_64-340.98.run
diff --git a/sources b/sources
index 448fb04..2074022 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-9e9e5551cba6a18061f2ef4f52a80e9e NVIDIA-Linux-armv7l-gnueabihf-340.96.run
-cb64b165b638671bcdc75bcf297b8d90 NVIDIA-Linux-x86-340.96.run
-f66b4f01a1edab6ce7d7b90d9b209cd1 NVIDIA-Linux-x86_64-340.96.run
+f1b77fd5c3d86d413ee8188cb2f9f224 NVIDIA-Linux-armv7l-gnueabihf-340.98.run
+3ccb023eec137cbee0d2035c288b6bbe NVIDIA-Linux-x86-340.98.run
+6d7c0c50fb50b277d580f1842d2a34fc NVIDIA-Linux-x86_64-340.98.run
diff --git a/xorg-x11-drv-nvidia-340xx.spec b/xorg-x11-drv-nvidia-340xx.spec
index adc2c40..32e1aa3 100644
--- a/xorg-x11-drv-nvidia-340xx.spec
+++ b/xorg-x11-drv-nvidia-340xx.spec
@@ -7,8 +7,8 @@
Name: xorg-x11-drv-nvidia-340xx
Epoch: 1
-Version: 340.96
-Release: 2%{?dist}
+Version: 340.98
+Release: 1%{?dist}
Summary: NVIDIA's 340xx series proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -519,6 +519,9 @@ fi ||:
%changelog
+* Tue Sep 27 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:340.98-1
+- Update to 340.98
+
* Wed Jun 22 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 1:340.96-2
- Disable on armhfp for now
8 years, 1 month
[dvdstyler] Let try compat-wxGTK3-gtk2, rfbz#4267
by Sérgio M. Basto
commit 8158d14c069cc95bc5429d540609fbba324a31dc
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Sep 27 09:08:54 2016 +0100
Let try compat-wxGTK3-gtk2, rfbz#4267
dvdstyler-wxwin.m4.patch | 27 +++++++++++++++++++++++++++
dvdstyler.spec | 15 ++++++++++-----
2 files changed, 37 insertions(+), 5 deletions(-)
---
diff --git a/dvdstyler-wxwin.m4.patch b/dvdstyler-wxwin.m4.patch
new file mode 100644
index 0000000..02b11aa
--- /dev/null
+++ b/dvdstyler-wxwin.m4.patch
@@ -0,0 +1,27 @@
+--- ./wxwin.m4.org 2016-09-27 07:44:11.968104125 +0100
++++ ./wxwin.m4 2016-09-27 07:45:28.972906202 +0100
+@@ -181,18 +181,18 @@ AC_DEFUN([WX_CONFIG_CHECK],
+
+ WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
+ wx_config_major_version=`echo $WX_VERSION | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
+ wx_config_minor_version=`echo $WX_VERSION | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
+ wx_config_micro_version=`echo $WX_VERSION | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
+
+ wx_requested_major_version=`echo $min_wx_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
+ wx_requested_minor_version=`echo $min_wx_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
+ wx_requested_micro_version=`echo $min_wx_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
+
+ _WX_PRIVATE_CHECK_VERSION([$wx_requested_major_version],
+ [$wx_requested_minor_version],
diff --git a/dvdstyler.spec b/dvdstyler.spec
index d493929..7c6848a 100644
--- a/dvdstyler.spec
+++ b/dvdstyler.spec
@@ -4,21 +4,22 @@
Name: dvdstyler
Epoch: 1
Version: 3.0.2
-Release: 2%{?prerel_real}%{?dist}
+Release: 3%{?prerel_real}%{?dist}
Summary: Cross-platform DVD authoring application
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.dvdstyler.de/
Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}%{?prerel}...
+Patch1: dvdstyler-wxwin.m4.patch
# build
BuildRequires: automake autoconf
BuildRequires: gettext
BuildRequires: byacc
# libraries
-BuildRequires: wxGTK3-devel >= 2.8.7
+BuildRequires: compat-wxGTK3-gtk2-devel >= 2.8.7
# wxsvg version with wxGTK3
-BuildRequires: wxsvg-devel >= 1.5.9-2
+BuildRequires: wxsvg-devel >= 1.5.9-4
BuildRequires: ffmpeg-devel
BuildRequires: ffmpeg
#BuildRequires: libgnomeui-devel
@@ -42,7 +43,7 @@ Requires: dvdauthor
Requires: mjpegtools
Requires: mkisofs
# wxsvg version with wxGTK3
-Requires: wxsvg >= 1.5.9-2
+Requires: wxsvg >= 1.5.9-4
# note: do not add Require: totem-backend or another DVD player - see
# RPM Fusion bug 366 for more details
@@ -54,6 +55,7 @@ create navigational DVD menus similar to those found on most commercial DVDs.
%prep
%setup -q -n DVDStyler-%{version}%{?prerel}
+%patch1 -p1
#{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h
%build
@@ -62,7 +64,7 @@ touch NEWS
#./autogen.sh
autoreconf -i
%configure \
- --disable-dependency-tracking --with-wx-config=/usr/bin/wx-config-3.0
+ --disable-dependency-tracking --with-wx-config=/usr/bin/wx-config-3.0-gtk2
# docs folder is not smp_mflags safe
make -C docs
%make_build
@@ -92,6 +94,9 @@ desktop-file-install \
%{_mandir}/*/*.gz
%changelog
+* Tue Sep 27 2016 Sérgio Basto <sergio(a)serjux.com> - 1:3.0.2-3
+- Let try compat-wxGTK3-gtk2, rfbz#4267
+
* Wed Sep 21 2016 Sérgio Basto <sergio(a)serjux.com> - 1:3.0.2-2
- Be sure that compiles with wxsvg-devel-1.5.9-2
8 years, 1 month
[wxsvg] Let try compat-wxGTK3-gtk2, rfbz#4267
by Sérgio M. Basto
commit 421d773c12b69871f3683dadeccb500bb187297a
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Sep 27 08:53:13 2016 +0100
Let try compat-wxGTK3-gtk2, rfbz#4267
wxsvg-wxwin.m4.patch | 27 +++++++++++++++++++++++++++
wxsvg.spec | 11 ++++++++---
2 files changed, 35 insertions(+), 3 deletions(-)
---
diff --git a/wxsvg-wxwin.m4.patch b/wxsvg-wxwin.m4.patch
new file mode 100644
index 0000000..c859927
--- /dev/null
+++ b/wxsvg-wxwin.m4.patch
@@ -0,0 +1,27 @@
+--- ./m4/wxwin.m4.org 2016-09-27 07:44:11.968104125 +0100
++++ ./m4/wxwin.m4 2016-09-27 07:45:28.972906202 +0100
+@@ -181,18 +181,18 @@ AC_DEFUN([WX_CONFIG_CHECK],
+
+ WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
+ wx_config_major_version=`echo $WX_VERSION | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
+ wx_config_minor_version=`echo $WX_VERSION | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
+ wx_config_micro_version=`echo $WX_VERSION | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
+
+ wx_requested_major_version=`echo $min_wx_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
+ wx_requested_minor_version=`echo $min_wx_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
+ wx_requested_micro_version=`echo $min_wx_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
+
+ _WX_PRIVATE_CHECK_VERSION([$wx_requested_major_version],
+ [$wx_requested_minor_version],
diff --git a/wxsvg.spec b/wxsvg.spec
index a10ca29..ec1b6d4 100644
--- a/wxsvg.spec
+++ b/wxsvg.spec
@@ -1,19 +1,20 @@
Name: wxsvg
Version: 1.5.9
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: C++ library to create, manipulate and render SVG files
Group: System Environment/Libraries
License: wxWidgets
URL: http://sourceforge.net/projects/wxsvg
Source0: http://downloads.sourceforge.net/wxsvg/wxsvg-%{version}.tar.bz2
+Patch1: wxsvg-wxwin.m4.patch
BuildRequires: autoconf automake libtool gettext
BuildRequires: expat-devel
BuildRequires: ffmpeg-devel
BuildRequires: freetype-devel
BuildRequires: libart_lgpl-devel
BuildRequires: pango-devel
-BuildRequires: wxGTK3-devel
+BuildRequires: compat-wxGTK3-gtk2-devel
%description
wxSVG is C++ library to create, manipulate and render SVG files.
@@ -28,6 +29,7 @@ provides the files required to develop programs that use wxsvg.
%prep
%setup -q
+%patch1 -p1
%build
#clean autogenerated files before run autoreconf
@@ -36,7 +38,7 @@ rm m4/libtool.m4 m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4
autoreconf -i
%configure \
--disable-dependency-tracking \
- --disable-static --with-wx-config=/usr/bin/wx-config-3.0
+ --disable-static --with-wx-config=/usr/bin/wx-config-3.0-gtk2
%{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
%{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -66,6 +68,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%{_libdir}/pkgconfig/lib%{name}.pc
%changelog
+* Tue Sep 27 2016 Sérgio Basto <sergio(a)serjux.com> - 1.5.9-4
+- Let try compat-wxGTK3-gtk2, rfbz#4267
+
* Tue Aug 16 2016 Sérgio Basto <sergio(a)serjux.com> - 1.5.9-3
- Remove Requires old wxGTK-devel in wxsvg-devel, also don't need Requires wxsvg
8 years, 1 month