[nvidia-340xx-kmod] patch for kernel-4.6
by Leigh Scott
commit e52d067b21073f0b7fd3472d939ee37a0d4f2d25
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jul 1 10:02:45 2016 +0100
patch for kernel-4.6
linux-4.6.patch | 150 +++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-340xx-kmod.spec | 7 ++-
2 files changed, 156 insertions(+), 1 deletion(-)
---
diff --git a/linux-4.6.patch b/linux-4.6.patch
new file mode 100644
index 0000000..0495ce1
--- /dev/null
+++ b/linux-4.6.patch
@@ -0,0 +1,150 @@
+--- /dev/null
++++ b/kernel/nv-mm.h
+@@ -0,0 +1,55 @@
++/*******************************************************************************
++ Copyright (c) 2016 NVIDIA Corporation
++
++ Permission is hereby granted, free of charge, to any person obtaining a copy
++ of this software and associated documentation files (the "Software"), to
++ deal in the Software without restriction, including without limitation the
++ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++ sell copies of the Software, and to permit persons to whom the Software is
++ furnished to do so, subject to the following conditions:
++
++ The above copyright notice and this permission notice shall be
++ included in all copies or substantial portions of the Software.
++
++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
++ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++ DEALINGS IN THE SOFTWARE.
++
++*******************************************************************************/
++#ifndef __NV_MM_H__
++#define __NV_MM_H__
++
++/* get_user_pages_remote() was added by:
++ * 2016 Feb 12: 1e9877902dc7e11d2be038371c6fbf2dfcd469d7
++ *
++ * The very next commit (cde70140fed8429acf7a14e2e2cbd3e329036653)
++ * deprecated the 8-argument version of get_user_pages for the
++ * non-remote case (calling get_user_pages with current and current->mm).
++ *
++ * The guidelines are: call NV_GET_USER_PAGES_REMOTE if you need the 8-argument
++ * version that uses something other than current and current->mm. Use
++ * NV_GET_USER_PAGES if you are refering to current and current->mm.
++ *
++* Note that get_user_pages_remote() requires the caller to hold a reference on
++* the task_struct (if non-NULL) and the mm_struct. This will always be true
++* when using current and current->mm. If the kernel passes the driver a vma
++* via driver callback, the kernel holds a reference on vma->vm_mm over that
++* callback.
++ */
++
++#if defined(NV_GET_USER_PAGES_REMOTE_PRESENT)
++ #define NV_GET_USER_PAGES get_user_pages
++ #define NV_GET_USER_PAGES_REMOTE get_user_pages_remote
++#else
++ #define NV_GET_USER_PAGES(start, nr_pages, write, force, pages, vmas) \
++ get_user_pages(current, current->mm, start, nr_pages, write, force, pages, vmas)
++
++ #define NV_GET_USER_PAGES_REMOTE get_user_pages
++#endif
++
++
++#endif // __NV_MM_H__
+--- a/kernel/os-mlock.c
++++ b/kernel/os-mlock.c
+@@ -13,6 +13,7 @@
+
+ #include "os-interface.h"
+ #include "nv-linux.h"
++#include "nv-mm.h"
+
+ RM_STATUS NV_API_CALL os_lock_user_pages(
+ void *address,
+@@ -45,7 +46,7 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
+ }
+
+ down_read(&mm->mmap_sem);
+- ret = get_user_pages(current, mm, (unsigned long)address,
++ ret = NV_GET_USER_PAGES((unsigned long)address,
+ page_count, write, force, user_pages, NULL);
+ up_read(&mm->mmap_sem);
+ pinned = ret;
+@@ -59,7 +59,7 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
+ else if (pinned < page_count)
+ {
+ for (i = 0; i < pinned; i++)
+- page_cache_release(user_pages[i]);
++ put_page(user_pages[i]);
+ os_free_mem(user_pages);
+ return RM_ERR_INVALID_ADDRESS;
+ }
+@@ -86,7 +86,7 @@ RM_STATUS NV_API_CALL os_unlock_user_pages(
+ {
+ if (write)
+ set_page_dirty_lock(user_pages[i]);
+- page_cache_release(user_pages[i]);
++ put_page(user_pages[i]);
+ }
+
+ os_free_mem(user_pages);
+diff --git a/kernel/conftest.sh.orig b/kernel/conftest.sh
+index d01488b..308ea8a 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -1669,6 +1669,23 @@ compile_test() {
+
+ compile_check_conftest "$CODE" "NV_NODE_END_PFN_PRESENT" "" "functions"
+ ;;
++
++ get_user_pages_remote)
++ #
++ # Determine if the function get_user_pages_remote() is
++ # present.
++ #
++ # get_user_pages_remote() was added by:
++ # 2016 Feb 12: 1e9877902dc7e11d2be038371c6fbf2dfcd469d7
++ #
++ CODE="
++ #include <linux/mm.h>
++ int conftest_get_user_pages_remote(void) {
++ get_user_pages_remote();
++ }"
++
++ compile_check_conftest "$CODE" "NV_GET_USER_PAGES_REMOTE_PRESENT" "" "functions"
++ ;;
+ esac
+ }
+
+diff --git a/kernel/Makefile.orig b/kernel/Makefile
+index 438d487..c52a36c 100644
+--- a/kernel/Makefile
++++ b/kernel/Makefile
+@@ -139,7 +139,8 @@ COMPILE_TESTS = \
+ drm_pci_set_busid \
+ write_cr4 \
+ for_each_online_node \
+- node_end_pfn
++ node_end_pfn \
++ get_user_pages_remote
+
+ #
+ # CFLAGS dependent on the type of builds (e.g. single/muliple module, debug)
+diff --git a/kernel/uvm/nvidia_uvm_lite.c.orig b/kernel/uvm/nvidia_uvm_lite.c
+index 442a0a8..695f092 100644
+--- a/kernel/uvm/nvidia_uvm_lite.c
++++ b/kernel/uvm/nvidia_uvm_lite.c
+@@ -785,7 +785,7 @@ int _fault_common(struct vm_area_struct *vma, unsigned long vaddr,
+ // a reference so that the fault handling logic is correct:
+ //
+ get_page(pTracking->uvmPage);
+- retValue = VM_FAULT_MINOR;
++ retValue = 0;
+ }
+
+ pRecord->isMapped = NV_TRUE;
diff --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec
index 005f7bf..404f5f4 100644
--- a/nvidia-340xx-kmod.spec
+++ b/nvidia-340xx-kmod.spec
@@ -9,7 +9,7 @@ Name: nvidia-340xx-kmod
Epoch: 1
Version: 340.96
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -17,6 +17,7 @@ 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)
@@ -45,6 +46,7 @@ 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%%___*}
@@ -92,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jul 01 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:340.96-3
+- patch for kernel-4.6
+
* Thu Jun 30 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 1:340.96-2
- Avoid armhfp for now
7 years, 9 months
[nvidia-kmod] Update to 367.27
by Leigh Scott
commit 17fdda79c0ab289f58ceb1be72a746d0c8ea0e0e
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jul 1 08:09:14 2016 +0100
Update to 367.27
nvidia-kmod.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 5cd5830..a566629 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -7,7 +7,7 @@
Name: nvidia-kmod
Epoch: 1
-Version: 358.16
+Version: 367.27
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jul 01 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:367.27-1
+- Update to 367.27
+
* Sat Nov 21 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:358.16-1
- Update to 358.16
7 years, 9 months
[xorg-x11-drv-nvidia] Update to 367.27
by Leigh Scott
commit 9e00d61ac94de3d0a849e6c407edcdf9f9b50665
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jul 1 08:08:56 2016 +0100
Update to 367.27
sources | 6 +++---
xorg-x11-drv-nvidia.spec | 18 +++++++++++++-----
2 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/sources b/sources
index a9652b8..3e3ffe6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-242eb8b93fd5777f17eae1e8df2b9444 NVIDIA-Linux-armv7l-gnueabihf-358.16.run
-5dfe11ca13548ca4813b10f3223d6014 NVIDIA-Linux-x86-358.16.run
-b766c62e2168cb9e125e5ae3bada4383 NVIDIA-Linux-x86_64-358.16.run
+e0c9cd78dc0575073d10fd13fe895d67 NVIDIA-Linux-armv7l-gnueabihf-367.27.run
+f32b9ab673acce56990f2b5acdc1e77f NVIDIA-Linux-x86-367.27.run
+8f146c8270430af73c7b4333f1c46eb8 NVIDIA-Linux-x86_64-367.27.run
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 737de1a..337c54f 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -183,7 +183,7 @@ install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/
# install stuff the wildcard missed
install -p -m 0755 libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/
ln -s libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/libEGL.so
-install -p -m 0755 libEGL_nvidia.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/
+install -p -m 0755 libEGL_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/
install -p -m 0755 libGLdispatch.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/
install -p -m 0755 libOpenGL.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/
ln -s libOpenGL.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenGL.so
@@ -515,16 +515,24 @@ fi ||:
%{_libdir}/vdpau/libvdpau_nvidia.so
%{_nvidia_libdir}/libnvidia-ifr.so
%{_nvidia_libdir}/libEGL.so
-%{_nvidia_libdir}/libGLESv1_CM.so
-%{_nvidia_libdir}/libGLESv2.so
+%{_nvidia_libdir}/libEGL_nvidia.so
+%{_nvidia_libdir}/libGLESv1_CM_nvidia.so
+%{_nvidia_libdir}/libGLESv2_nvidia.so
%{_nvidia_libdir}/libnvidia-eglcore.so
+%{_nvidia_libdir}/libnvidia-egl-wayland.so
+%{_nvidia_libdir}/libnvidia-fatbinaryloader.so
+%{_nvidia_libdir}/libnvidia-fbc.so
+%{_nvidia_libdir}/libnvidia-glcore.so
%{_nvidia_libdir}/libnvidia-glsi.so
+%{_nvidia_libdir}/libnvidia-ptxjitcompiler.so
%{_nvidia_libdir}/libGL.so
-%{_nvidia_libdir}/libnvidia-glcore.so
-%{_nvidia_libdir}/libnvidia-fbc.so
+%{_nvidia_libdir}/libGLX_nvidia.so
%{_nvidia_libdir}/libOpenGL.so
%changelog
+* Fri Jul 01 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:367.27-1
+- Update to 367.27
+
* Wed Jun 22 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 1:367.27-1
- Update to 367.27
7 years, 9 months
[mac/f24] patch for gcc-6
by Leigh Scott
Summary of changes:
0b88c78... patch for gcc-6 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 9 months
[mac] patch for gcc-6
by Leigh Scott
commit 0b88c7833db953463e9805e722d4300fd3279fb8
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jul 1 07:35:07 2016 +0100
patch for gcc-6
mac-3.99-u4-b5-gcc6.patch | 87 +++++++++++++++++++++++++++++++++++++++++++++++
mac.spec | 7 +++-
2 files changed, 93 insertions(+), 1 deletion(-)
---
diff --git a/mac-3.99-u4-b5-gcc6.patch b/mac-3.99-u4-b5-gcc6.patch
new file mode 100644
index 0000000..e797c87
--- /dev/null
+++ b/mac-3.99-u4-b5-gcc6.patch
@@ -0,0 +1,87 @@
+--- a/src/MACLib/APECompress.cpp
++++ b/src/MACLib/APECompress.cpp
+@@ -3,6 +3,7 @@
+ #include IO_HEADER_FILE
+ #include "APECompressCreate.h"
+ #include "WAVInputSource.h"
++#define min(a,b) ((a)<(b)?(a):(b))
+
+ CAPECompress::CAPECompress()
+ {
+
+--- a/src/MACLib/APEDecompress.cpp
++++ b/src/MACLib/APEDecompress.cpp
+@@ -7,6 +7,7 @@
+ #include "NewPredictor.h"
+
+ #define DECODE_BLOCK_SIZE 4096
++#define min(a,b) ((a)<(b)?(a):(b))
+
+ CAPEDecompress::CAPEDecompress(int * pErrorCode, CAPEInfo * pAPEInfo, int nStartBlock, int nFinishBlock)
+ {
+
+--- a/src/MACLib/APESimple.cpp
++++ b/src/MACLib/APESimple.cpp
+@@ -14,6 +14,7 @@
+ #define UNMAC_DECODER_OUTPUT_APE 2
+
+ #define BLOCKS_PER_DECODE 9216
++#define min(a,b) ((a)<(b)?(a):(b))
+
+ int DecompressCore(const str_utf16 * pInputFilename, const str_utf16 * pOutputFilename, int nOutputMode, int nCompressionLevel, int * pPercentageDone, APE_PROGRESS_CALLBACK ProgressCallback, int * pKillFlag);
+
+
+--- a/src/MACLib/BitArray.cpp
++++ b/src/MACLib/BitArray.cpp
+@@ -20,6 +20,8 @@
+ #define SHIFT_BITS (CODE_BITS - 9)
+ #define EXTRA_BITS ((CODE_BITS - 2) % 8 + 1)
+ #define BOTTOM_VALUE (TOP_VALUE >> 8)
++#define min(a,b) ((a)<(b)?(a):(b))
++#define max(a,b) ((a)>(b)?(a):(b))
+
+ /************************************************************************************
+ Lookup tables
+
+--- a/src/MACLib/APETag.cpp
++++ b/src/MACLib/APETag.cpp
+@@ -4,6 +4,7 @@
+ #include "CharacterHelper.h"
+ #include "IO.h"
+ #include IO_HEADER_FILE
++#define max(a,b) ((a)>(b)?(a):(b))
+
+ /*****************************************************************************************
+ CAPETagField
+
+--- a/src/MACLib/MACProgressHelper.cpp
++++ b/src/MACLib/MACProgressHelper.cpp
+@@ -1,5 +1,6 @@
+ #include "All.h"
+ #include "MACProgressHelper.h"
++#define max(a,b) ((a)>(b)?(a):(b))
+
+ CMACProgressHelper::CMACProgressHelper(int nTotalSteps, int * pPercentageDone, APE_PROGRESS_CALLBACK ProgressCallback, int * pKillFlag)
+ {
+
+--- a/src/MACLib/UnBitArray.cpp
++++ b/src/MACLib/UnBitArray.cpp
+@@ -23,6 +23,7 @@
+ #define BOTTOM_VALUE (TOP_VALUE >> 8)
+
+ #define MODEL_ELEMENTS 64
++#define max(a,b) ((a)>(b)?(a):(b))
+
+ /***********************************************************************************
+ Construction
+
+--- a/src/MACLib/Prepare.cpp
++++ b/src/MACLib/Prepare.cpp
+@@ -1,5 +1,6 @@
+ #include "All.h"
+ #include "Prepare.h"
++#define max(a,b) ((a)>(b)?(a):(b))
+
+ const uint32 CRC32_TABLE[256] = {0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,
+ 4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,
+
diff --git a/mac.spec b/mac.spec
index 5e95507..063a4fe 100644
--- a/mac.spec
+++ b/mac.spec
@@ -1,6 +1,6 @@
Name: mac
Version: 3.99
-Release: 12.u4b5%{?dist}
+Release: 13.u4b5%{?dist}
Summary: Monkey's Audio Codec (MAC) utility
Group: Applications/Multimedia
@@ -11,6 +11,7 @@ Source1: mac-permission_to_redistribute.txt
Patch0: mac-3.99-u4-b5-gcc44.patch
Patch1: mac-3.99-u4-b5-analyse.patch
Patch2: mac-3.99-u4-b5-gcc45.patch
+Patch3: mac-3.99-u4-b5-gcc6.patch
%ifarch i686 x86_64
BuildRequires: yasm
@@ -59,6 +60,7 @@ developing applications that use %{name}.
%patch0 -p1 -b .gcc44
%patch1 -p1 -b .an
%patch2 -p1 -b .gcc45
+%patch3 -p1 -b .gcc6
#Copy permission to redistribute
cp -p %{SOURCE1} .
@@ -121,6 +123,9 @@ execstack -c $RPM_BUILD_ROOT%{_libdir}/libmac.so.2.0.0
%changelog
+* Fri Jul 01 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.99-13.u4b5
+- patch for gcc-6
+
* Thu Jun 30 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 3.99-12.u4b5
- Spec clean-up
- Use execstrack instead of prelink on fedora 23 and later
7 years, 9 months
[yabause] Disabled hardened build for now, assembly is not ready
by Sérgio M. Basto
commit ecf836c2a626bcda1e497677ea2159e2a543884a
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Thu Jun 2 08:42:11 2016 +0200
Disabled hardened build for now, assembly is not ready
yabause.spec | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
---
diff --git a/yabause.spec b/yabause.spec
index 0f69702..5cf7524 100644
--- a/yabause.spec
+++ b/yabause.spec
@@ -1,6 +1,8 @@
+%undefine _hardened_build
+
Name: yabause
Version: 0.9.14
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A Sega Saturn emulator
License: GPLv2+
URL: http://yabause.org
@@ -25,6 +27,12 @@ but optionally a real Saturn BIOS can be used, however it is not included.
%build
+CFLAGS="$RPM_OPT_FLAGS -Wl,-z,relro -Wl,-z,now"
+CXXFLAGS="$RPM_OPT_FLAGS -Wl,-z,relro -Wl,-z,now"
+
+export CFLAGS
+export CXXFLAGS
+
%cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DYAB_PORTS=qt -DYAB_OPTIMIZATION=-O2 .
make %{?_smp_mflags}
@@ -46,6 +54,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%changelog
+* Thu Jun 02 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.9.14-2
+- Disabled hardened build for now, assembly is not ready
+
* Sat Jun 06 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.9.14-1
- Updated to 0.9.14
7 years, 10 months
[guvcview/f24] Updated to 2.0.4
by Sérgio M. Basto
Summary of changes:
a4d99cc... Updated to 2.0.4 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 10 months
[guvcview] Updated to 2.0.4
by Sérgio M. Basto
commit a4d99cc7548a0ad94b9b449b3534e6599e665a2d
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Jul 1 02:25:42 2016 +0100
Updated to 2.0.4
- Fixed build with ffmpeg-3.0.x using a patch from Gentoo
.gitignore | 1 +
guvcview.spec | 16 +++++++++++-----
sources | 2 +-
3 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a277549..f479d91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
guvcview-src-2.0.1.tar.gz
+guvcview-src-2.0.4.tar.gz
diff --git a/guvcview.spec b/guvcview.spec
index 314b2be..b1ae100 100644
--- a/guvcview.spec
+++ b/guvcview.spec
@@ -1,5 +1,5 @@
Name: guvcview
-Version: 2.0.1
+Version: 2.0.4
Release: 1%{?dist}
Summary: GTK+ UVC Viewer and Capturer
Group: Amusements/Graphics
@@ -8,6 +8,7 @@ Group: Amusements/Graphics
License: GPLv3+
URL: http://guvcview.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
+Patch0: ffmpeg3.patch
BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.0
BuildRequires: pkgconfig(glib-2.0) >= 2.10.0
BuildRequires: pkgconfig(portaudio-2.0)
@@ -51,6 +52,7 @@ This package contains development files for %{name}.
%prep
%setup -q -n %{name}-src-%{version}
+%patch0 -p1 -b .ffmpeg3
find . \( -name '*.h' -o -name '*.c' \) -exec chmod -x {} \;
@@ -88,10 +90,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%files -f %{name}.lang
%doc _doc/*
%{_bindir}/%{name}
-%{_libdir}/libgviewaudio-1.0.so.*
-%{_libdir}/libgviewencoder-1.0.so.*
-%{_libdir}/libgviewrender-1.0.so.*
-%{_libdir}/libgviewv4l2core-1.0.so.*
+%{_libdir}/libgviewaudio-2.0.so.*
+%{_libdir}/libgviewencoder-2.0.so.*
+%{_libdir}/libgviewrender-2.0.so.*
+%{_libdir}/libgviewv4l2core-2.0.so.*
%{_mandir}/man1/%{name}.1*
%{_datadir}/pixmaps/%{name}
%{_datadir}/applications/%{name}.desktop
@@ -111,6 +113,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%changelog
+* Thu Jun 30 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 2.0.4-1
+- Updated to 2.0.4
+- Fixed build with ffmpeg-3.0.x using a patch from Gentoo
+
* Fri Jun 26 2015 Thomas Moschny <thomas.moschny(a)gmx.de> - 2.0.1-1
- Update to 2.0.1.
- Update build requirements.
diff --git a/sources b/sources
index 778e6a2..f2d9621 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-54e608b8a2c13d96f546197117d758f4 guvcview-src-2.0.1.tar.gz
+a6d900166ac2bba251a2c09cb602f1fe guvcview-src-2.0.4.tar.gz
7 years, 10 months