[xorg-x11-drv-nvidia-340xx] Update to 340.104
by Leigh Scott
commit 9756c5a756eebc23808aea949ecbf5f17167c839
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Sep 19 22:17:26 2017 +0100
Update to 340.104
.gitignore | 2 ++
sources | 4 ++--
xorg-x11-drv-nvidia-340xx.spec | 12 ++++++++----
3 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3b68df4..745b412 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@ NVIDIA-Linux-armv7l-gnueabihf-340.93.run
/NVIDIA-Linux-x86_64-340.101.run
/NVIDIA-Linux-x86-340.102.run
/NVIDIA-Linux-x86_64-340.102.run
+/NVIDIA-Linux-x86-340.104.run
+/NVIDIA-Linux-x86_64-340.104.run
diff --git a/sources b/sources
index 52e83c6..e447fdc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-61aad6a98238bc61466e6a9e392cfd08 NVIDIA-Linux-x86-340.102.run
-088934d412a8faab4592b352e1535857 NVIDIA-Linux-x86_64-340.102.run
+42e9c98e156f6ac2658ee526d796a428 NVIDIA-Linux-x86-340.104.run
+4750891b7e175c0dc9a04608e493d141 NVIDIA-Linux-x86_64-340.104.run
diff --git a/xorg-x11-drv-nvidia-340xx.spec b/xorg-x11-drv-nvidia-340xx.spec
index d9fc950..c468a27 100644
--- a/xorg-x11-drv-nvidia-340xx.spec
+++ b/xorg-x11-drv-nvidia-340xx.spec
@@ -7,15 +7,15 @@
Name: xorg-x11-drv-nvidia-340xx
Epoch: 1
-Version: 340.102
-Release: 2%{?dist}
+Version: 340.104
+Release: 1%{?dist}
Summary: NVIDIA's 340xx series proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
URL: http://www.nvidia.com/
-Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%...
-Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
+Source0: http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-...
+Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x...
#Source4: ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/%{version}/NVIDIA-Linux...
Source2: 99-nvidia.conf
Source3: nvidia-xorg.conf
@@ -519,6 +519,10 @@ fi ||:
%changelog
+* Tue Sep 19 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:340.104-1
+- Update to 340.104
+- Fix source URL
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1:340.102-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
7 years, 2 months
[ProjectX] Corrected screenshot size.
by Göran Uddeborg
commit 0ff94d8bf5490e1051fb91c321a99de65962494c
Author: Göran Uddeborg <goeran(a)uddeborg.se>
Date: Tue Sep 19 21:41:03 2017 +0200
Corrected screenshot size.
projectx.appdata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/projectx.appdata.xml b/projectx.appdata.xml
index cf95818..3371c0a 100644
--- a/projectx.appdata.xml
+++ b/projectx.appdata.xml
@@ -24,7 +24,7 @@
<launchable type="desktop-id">xpenguins.desktop</launchable>
<screenshots>
<screenshot type="default">
- <image width="465" height="262">
+ <image width="864" height="639">
https://pkgs.rpmfusion.org/cgit/free/ProjectX.git/plain/screenshot.png
</image>
</screenshot>
7 years, 2 months
[nvidia-settings] Fix build
by Nicolas Chauvet
commit 7eed2dc08bbafa98962ab2c4d58fae72d312a501
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Sep 19 21:14:14 2017 +0200
Fix build
nvidia-settings.spec | 44 ++++++++++++++++++++++++++++++++++----------
1 file changed, 34 insertions(+), 10 deletions(-)
---
diff --git a/nvidia-settings.spec b/nvidia-settings.spec
index 0207962..bf49c58 100644
--- a/nvidia-settings.spec
+++ b/nvidia-settings.spec
@@ -11,20 +11,20 @@ Source0: %{url}/nvidia-settings-%{version}.tar.bz2
ExclusiveArch: i686 x86_64 armv7hl aarch64 ppc64le
BuildRequires: desktop-file-utils
+BuildRequires: hostname
BuildRequires: gtk2-devel
+%if 0%{?fedora} || 0%{?rhel} > 6
BuildRequires: gtk3-devel
-#We are using the internal version
-#BuildRequires: libXNVCtrl-devel
+%endif
BuildRequires: libXxf86vm-devel
BuildRequires: libXext-devel
BuildRequires: libXrandr-devel
BuildRequires: libXv-devel
BuildRequires: libvdpau-devel
BuildRequires: m4
-#Needed for FBConfig table - Uneeded if GLX_VERSION_1_3
-#BuildRequires: xorg-x11-drv-nvidia-devel
BuildRequires: mesa-libGL-devel
+BuildRequires: pkgconfig(dbus-1)
%description
@@ -42,6 +42,7 @@ nvidia-settings is compatible with driver %{version}.
rm -rf src/libXNVCtrl/libXNVCtrl.a
sed -i -e 's|/usr/local|%{_prefix}|g' utils.mk
+sed -i -e 's|/lib$|/%{_lib}|g' utils.mk
sed -i -e 's|-lXxf86vm|-lXxf86vm -ldl -lm|g' Makefile
%build
@@ -49,29 +50,52 @@ sed -i -e 's|-lXxf86vm|-lXxf86vm -ldl -lm|g' Makefile
export CFLAGS="%{optflags}"
export LDFLAGS="%{?__global_ldflags}"
pushd src/libXNVCtrl
- make
+ make \
+ NVDEBUG=1 \
+ NV_VERBOSE=1 \
+ X_CFLAGS="${CFLAGS}"
+
popd
make \
NVDEBUG=1 \
NV_VERBOSE=1 \
+ STRIP_CMD=true NV_KEEP_UNSTRIPPED_BINARIES=1 \
X_LDFLAGS="-L%{_libdir}" \
- CC_ONLY_CFLAGS="%{optflags}" || :
+ CC_ONLY_CFLAGS="%{optflags}"
+(cd src/_out/Linux_*/ ; for i in %{name} libnvidia-gtk{2,3}.so ; do cp $i.unstripped $i; done ; cd -)
%install
%make_install INSTALL="install -p"
+# Desktop entry for nvidia-settings
mkdir -p %{buildroot}%{_datadir}/applications
+install -m 0644 doc/nvidia-settings.desktop \
+ %{buildroot}%{_datadir}/applications
-# Desktop entry for nvidia-settings
-desktop-file-install --vendor \
- --dir %{buildroot}%{_datadir}/applications/ \
- doc/nvidia-settings.desktop
+sed -i -e 's|__UTILS_PATH__/||' -e 's|__PIXMAP_PATH__/||' \
+ -e 's|nvidia-settings.png|nvidia-settings|' \
+ -e 's|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Application;Settings;|' \
+ %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+desktop-file-validate \
+ %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+# Pixmap installation
+mkdir -p %{buildroot}%{_datadir}/pixmap
+install -pm 0644 doc/nvidia-settings.png \
+ %{buildroot}%{_datadir}/pixmap
%files
%doc doc/*.txt
%{_bindir}/nvidia-settings
+%{_libdir}/libnvidia-gtk?.so.*
+%if 0%{?fedora} || 0%{?rhel} > 6
+%exclude %{_libdir}/libnvidia-gtk2.so.*
+%endif
+%{_datadir}/pixmap/%{name}.png
+%{_datadir}/applications/%{name}.desktop
%{_mandir}/man1/nvidia-settings.1.*
7 years, 2 months
[ProjectX] Appdata added.
by Göran Uddeborg
commit 2cba8d3b2ba439fe37ac81d8afbf5e8a01fef334
Author: Göran Uddeborg <goeran(a)uddeborg.se>
Date: Tue Sep 19 20:50:49 2017 +0200
Appdata added.
ProjectX.spec | 15 +++++++++++++--
projectx.appdata.xml | 34 ++++++++++++++++++++++++++++++++++
screenshot.png | Bin 0 -> 240040 bytes
3 files changed, 47 insertions(+), 2 deletions(-)
---
diff --git a/ProjectX.spec b/ProjectX.spec
index 2b05509..14305c3 100644
--- a/ProjectX.spec
+++ b/ProjectX.spec
@@ -1,15 +1,15 @@
Name: ProjectX
Version: 0.91.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: DVB video editing and demultiplexing tool
Summary(sv): Verktyg för redigering och demultiplexning av DVB-video
-Group: Applications/Multimedia
License: GPLv2+
URL: http://project-x.sourceforge.net/
Source0: http://downloads.sourceforge.net/project/project-x/project-x/%{name}_%ver...
Source1: http://gentoo.sbriesen.de/distfiles/projectx-idctfast.tar.xz
+Source2: projectx.appdata.xml
Patch0: %name-0.90.4.00-20100801cvs.sysjava.patch
Patch1: %name-0.90.4.00-20100806cvs.desktop.patch
Patch2: %name-0.90.4.00-20100806cvs.helpfiles.patch
@@ -21,6 +21,7 @@ BuildRequires: apache-commons-net
BuildRequires: jpackage-utils
BuildRequires: desktop-file-utils
BuildRequires: dos2unix
+BuildRequires: libappstream-glib
Requires: java >= 1.2.2
Requires: jakarta-oro
Requires: apache-commons-net
@@ -78,8 +79,14 @@ install -p -m u=rw,go=r %name.jar %buildroot%_jnidir
install -p lib/PORTABLE/libidctfast.so %buildroot%_libdir/%name
%jpackage_script net.sourceforge.dvb.projectx.common.Start "-Djava.library.path=%_libdir/%name" "" ProjectX:commons-net:jakarta-oro projectx true
desktop-file-install --dir=%buildroot%_datadir/applications projectx.desktop
+install -d %buildroot%_datadir/metainfo
+cp -p %SOURCE2 %buildroot%_datadir/metainfo
+%check
+appstream-util validate-relax --nonet \
+ %buildroot%_datadir/metainfo/projectx.appdata.xml
+
%files
%license Copying
%doc ReadMe.txt ReleaseNotes_0.91.0.txt
@@ -87,9 +94,13 @@ desktop-file-install --dir=%buildroot%_datadir/applications projectx.desktop
%_jnidir/%name.jar
%_libdir/%name
%_datadir/applications/projectx.desktop
+%_datadir/metainfo/projectx.appdata.xml
%changelog
+* Tue Sep 19 2017 Göran Uddeborg <goeran(a)uddeborg.se> 0.91.0-9
+- Appdata added.
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.91.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/projectx.appdata.xml b/projectx.appdata.xml
new file mode 100644
index 0000000..cf95818
--- /dev/null
+++ b/projectx.appdata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+ <id>projectx.desktop</id>
+ <metadata_license>CC-BY-SA-4.0</metadata_license>
+ <project_license>GPL-2.0+</project_license>
+ <description>
+ <p>
+ In many countries digital radio and television uses the Digital
+ Video Broadcasting (DVB) standard to broadcast its data. Project
+ X is a tool to analyze and manipulate these DVB MPEG data
+ streams. It can cut and demultiplex them and it tries its best
+ to handle and repair many stream types and show what went wrong
+ on reception.
+ </p>
+ <p xml:lang="sv">
+ I många länder använder digital radio och television
+ DVB-standarden (Digital Video Broadcasting) för att sända sina
+ data. Project X är ett verktyg för att analysera och hantera
+ dessa DVB-MPEG-dataströmmar. Det kan dela upp och demultiplexa
+ dem och det gör sitt bästa för att hantera och reparera många
+ strömtyper och visa vad som gick fel vid mottagningen.
+ </p>
+ </description>
+ <launchable type="desktop-id">xpenguins.desktop</launchable>
+ <screenshots>
+ <screenshot type="default">
+ <image width="465" height="262">
+ https://pkgs.rpmfusion.org/cgit/free/ProjectX.git/plain/screenshot.png
+ </image>
+ </screenshot>
+ </screenshots>
+ <url type="homepage">http://project-x.sourceforge.net/</url>
+ <update_contact>goeran(a)uddeborg.se</update_contact>
+</component>
diff --git a/screenshot.png b/screenshot.png
new file mode 100644
index 0000000..622820a
Binary files /dev/null and b/screenshot.png differ
7 years, 2 months
[nvidia-xconfig] Strip hack
by Nicolas Chauvet
commit 7620ae60e8d0449d0f42c23954dfd5180a0de2f9
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Sep 19 19:05:38 2017 +0200
Strip hack
nvidia-xconfig.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/nvidia-xconfig.spec b/nvidia-xconfig.spec
index 11e324d..bde8ded 100644
--- a/nvidia-xconfig.spec
+++ b/nvidia-xconfig.spec
@@ -11,6 +11,7 @@ Patch0: nvidia-xconfig-1.0-default.patch
ExclusiveArch: i686 x86_64 armv7hl aarch64 ppc64le
+BuildRequires: hostname
BuildRequires: m4
@@ -29,8 +30,10 @@ sed -i -e 's|/usr/local|%{_prefix}|g' utils.mk
make \
NVDEBUG=1 \
NV_VERBOSE=1 \
+ STRIP_CMD=true NV_KEEP_UNSTRIPPED_BINARIES=1 \
X_LDFLAGS="-L%{_libdir}" \
CC_ONLY_CFLAGS="%{optflags}"
+(cd _out/Linux_*/ ; cp %{name}.unstripped %{name} ; cd -)
%install
7 years, 2 months
[nvidia-xconfig] fixup arches path
by Nicolas Chauvet
commit 7c276b53fc89c489dbdbeb6ff84e7fec022a128f
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Sep 19 18:40:51 2017 +0200
fixup arches path
nvidia-xconfig.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/nvidia-xconfig.spec b/nvidia-xconfig.spec
index 764fb81..11e324d 100644
--- a/nvidia-xconfig.spec
+++ b/nvidia-xconfig.spec
@@ -9,7 +9,7 @@ URL: https://download.nvidia.com/XFree86/nvidia-xconfig
Source0: %{url}/nvidia-xconfig-%{version}.tar.bz2
Patch0: nvidia-xconfig-1.0-default.patch
-ExclusiveArch: i686 x86_64 armv7hl
+ExclusiveArch: i686 x86_64 armv7hl aarch64 ppc64le
BuildRequires: m4
@@ -40,7 +40,7 @@ mkdir -p %{buildroot}%{_sbindir}
%files
%license COPYING
-%{_sbindir}/nvidia-xconfig
+%{_bindir}/nvidia-xconfig
%{_mandir}/man1/nvidia-xconfig.1.*
7 years, 2 months
[nvidia-settings] Add missing arches
by Nicolas Chauvet
commit 60ec91d069a298ee41cc544ef8c9586349480eec
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Sep 19 18:29:35 2017 +0200
Add missing arches
nvidia-settings.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/nvidia-settings.spec b/nvidia-settings.spec
index 11bf017..0207962 100644
--- a/nvidia-settings.spec
+++ b/nvidia-settings.spec
@@ -8,7 +8,7 @@ License: GPLv2+
URL: https://download.nvidia.com/XFree86/nvidia-settings/
Source0: %{url}/nvidia-settings-%{version}.tar.bz2
-ExclusiveArch: i686 x86_64 armv7hl
+ExclusiveArch: i686 x86_64 armv7hl aarch64 ppc64le
BuildRequires: desktop-file-utils
7 years, 2 months
[nvidia-settings] Add missing BR
by Nicolas Chauvet
commit 5f04a567d7b365f7b76f4007caf09f2ccec971fe
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Sep 19 18:28:53 2017 +0200
Add missing BR
nvidia-settings.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/nvidia-settings.spec b/nvidia-settings.spec
index 031824c..11bf017 100644
--- a/nvidia-settings.spec
+++ b/nvidia-settings.spec
@@ -12,6 +12,7 @@ ExclusiveArch: i686 x86_64 armv7hl
BuildRequires: desktop-file-utils
+BuildRequires: gtk2-devel
BuildRequires: gtk3-devel
#We are using the internal version
#BuildRequires: libXNVCtrl-devel
7 years, 2 months
