[devedeng] Updated to new upstream release
by Andrea Musuruane
commit 98c336654c50e43314a2ff02f51f129bc4d9d9f2
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sun Dec 18 18:32:02 2016 +0100
Updated to new upstream release
.gitignore | 1 +
devedeng.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8831976..9edfb7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/devedeng-4.8.3.tar.gz
/devedeng-4.8.4.tar.gz
/devedeng-4.8.5.tar.gz
+/devedeng-4.8.6.tar.gz
diff --git a/devedeng.spec b/devedeng.spec
index c90c746..4c19c01 100644
--- a/devedeng.spec
+++ b/devedeng.spec
@@ -1,5 +1,5 @@
Name: devedeng
-Version: 4.8.5
+Version: 4.8.6
Release: 1%{?dist}
Summary: A program to create video DVDs and CDs (VCD, sVCD or CVD)
@@ -111,6 +111,9 @@ fi
%changelog
+* Sat Dec 17 2016 Andrea Musuruane <musuruan(a)gmail.com> 4.8.6-1
+- Updated to new upstream release
+
* Sat Nov 26 2016 Andrea Musuruane <musuruan(a)gmail.com> 4.8.5-1
- Updated to new upstream release
diff --git a/sources b/sources
index 47b4ed6..1f27ca0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-83271127db74f668cab07aed38158813 devedeng-4.8.5.tar.gz
+83d41bd1c7824a34b2095cca5102c75a devedeng-4.8.6.tar.gz
7 years, 11 months
[ffmpeg] Document that we don't use autotools script here
by Dominik Mierzejewski
commit 4b67fc5fe18fa3909d80430d005e1181c918cad9
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Dec 15 15:28:42 2016 +0100
Document that we don't use autotools script here
ffmpeg.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index d488ff8..77818bb 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -163,6 +163,7 @@ VCR. It can encode in real time in many formats including MPEG1 audio
and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
This package contains development files for %{name}
+# Don't use the %%configure macro as this is not an autotool script
%global ff_configure \
./configure \\\
--prefix=%{_prefix} \\\
7 years, 11 months
[ffmpeg] Enable/Rework CUDA conditionals and flags
by Dominik Mierzejewski
commit 86d6291b4ff9b8abfd681c597b831cdd2efa9e2c
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Dec 18 00:58:18 2016 +0100
Enable/Rework CUDA conditionals and flags
Signed-off-by: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
ffmpeg.spec | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index a0455bb..d488ff8 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -17,6 +17,16 @@
%global _without_nvenc 1
%endif
+# extras flags
+%if 0%{!?_without_nvenc:1}
+%global nvenc_cflags -I%{_includedir}/nvenc
+%endif
+%if 0%{?_with_cuda}
+%{!?_cuda_includedir:%global _cuda_includedir $(pkg-config --cflags cuda-8.0)}
+%global cuda_cflags -I%{_cuda_includedir}
+%global cuda_ldflags -L%{_libdir}/nvidia
+%endif
+
%if 0%{?_without_gpl}
%global lesser L
%endif
@@ -164,7 +174,8 @@ This package contains development files for %{name}
--mandir=%{_mandir} \\\
--arch=%{_target_cpu} \\\
--optflags="%{optflags}" \\\
- --extra-ldflags="%{?__global_ldflags}" \\\
+ --extra-ldflags="%{?__global_ldflags} %{?cuda_ldflags}" \\\
+ --extra-cflags="%{?nvenc_cflags} %{?cuda_cflags}" \\\
%{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-version3} \\\
--enable-bzlib \\\
%{?_with_chromaprint:--enable-chromaprint} \\\
@@ -179,6 +190,8 @@ This package contains development files for %{name}
--enable-libbluray \\\
%{?_with_bs2b:--enable-libbs2b} \\\
%{?_with_caca:--enable-libcaca} \\\
+ %{?_with_cuda:--enable-cuda --enable-nonfree} \\\
+ %{?_with_cuvid:--enable-cuvid --enable-nonfree} \\\
%{!?_without_cdio:--enable-libcdio} \\\
%{?_with_ieee1394:--enable-libdc1394 --enable-libiec61883} \\\
%{?_with_faac:--enable-libfaac --enable-nonfree} \\\
@@ -190,9 +203,10 @@ This package contains development files for %{name}
%{?_with_gme:--enable-libgme} \\\
--enable-libgsm \\\
%{?_with_ilbc:--enable-libilbc} \\\
+ %{?_with_libnpp:--enable-libnpp --enable-nonfree} \\\
--enable-libmp3lame \\\
%{?_with_netcdf:--enable-netcdf} \\\
- %{!?_without_nvenc:--enable-nvenc --extra-cflags="-I%{_includedir}/nvenc"} \\\
+ %{!?_without_nvenc:--enable-nvenc} \\\
%{!?_without_openal:--enable-openal} \\\
%{!?_without_opencl:--enable-opencl} \\\
%{!?_without_opencv:--enable-libopencv} \\\
7 years, 11 months
[ffmpeg] allow disabling x11grab support
by Dominik Mierzejewski
commit 543e0eae8c5d5969c8639137960a7d897d228293
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Sun Dec 18 00:52:45 2016 +0100
allow disabling x11grab support
ffmpeg.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index f166f92..a0455bb 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -220,7 +220,7 @@ This package contains development files for %{name}
%{!?_without_xvid:--enable-libxvid} \\\
%{?_with_zmq:--enable-libzmq} \\\
%{?_with_zvbi:--enable-libzvbi} \\\
- --enable-x11grab \\\
+ %{!?_without_x11grab:--enable-x11grab} \\\
--enable-avfilter \\\
--enable-avresample \\\
--enable-postproc \\\
7 years, 11 months
[ffmpeg] make license selection more flexible
by Dominik Mierzejewski
commit cc81169190a2bb4911f4d900f4bad269ee9becae
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Dec 18 00:48:13 2016 +0100
make license selection more flexible
slightly adapted from the original patch by Nicolas.
Signed-off-by: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
ffmpeg.spec | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index e41ab90..f166f92 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -17,15 +17,21 @@
%global _without_nvenc 1
%endif
+%if 0%{?_without_gpl}
+%global lesser L
+%endif
+
+%if 0%{?_with_amr} || 0%{?_with_gmp} || 0%{?_with_smb}
+%global ffmpeg_license %{?lesser}GPLv3+
+%else
+%global ffmpeg_license %{?lesser}GPLv2+
+%endif
+
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 3.2.2
Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
-%if 0%{?_with_amr} || 0%{?_with_gmp}
-License: GPLv3+
-%else
-License: GPLv2+
-%endif
+License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
Source0: %{name}-%{?branch}%{date}.tar.bz2
@@ -221,7 +227,7 @@ This package contains development files for %{name}
--enable-pthreads \\\
--disable-static \\\
--enable-shared \\\
- --enable-gpl \\\
+ %{!?_without_gpl:--enable-gpl} \\\
--disable-debug \\\
--disable-stripping
7 years, 11 months
[nvidia-340xx-kmod] patch to fix loading module on 4.9 kernel
by Leigh Scott
commit f932998da85b26041f891c30cd3f3e961a4374f8
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Dec 17 10:05:02 2016 +0000
patch to fix loading module on 4.9 kernel
4.9.0_kernel.patch | 14 ++++++++++++++
nvidia-340xx-kmod.spec | 7 ++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
---
diff --git a/4.9.0_kernel.patch b/4.9.0_kernel.patch
new file mode 100644
index 0000000..dc80b97
--- /dev/null
+++ b/4.9.0_kernel.patch
@@ -0,0 +1,14 @@
+--- a/kernel/nv-drm.c 2016-12-15 12:41:26.000000000 +0100
++++ b/kernel/nv-drm.c 2016-12-15 12:58:48.000000000 +0100
+@@ -115,7 +115,11 @@
+ };
+
+ static struct drm_driver nv_drm_driver = {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++ .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_LEGACY,
++#else
+ .driver_features = DRIVER_GEM | DRIVER_PRIME,
++#endif
+ .load = nv_drm_load,
+ .unload = nv_drm_unload,
+ .fops = &nv_drm_fops,
diff --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec
index 978b901..3e462b4 100644
--- a/nvidia-340xx-kmod.spec
+++ b/nvidia-340xx-kmod.spec
@@ -10,7 +10,7 @@ Name: nvidia-340xx-kmod
Epoch: 1
Version: 340.101
# 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
@@ -18,6 +18,7 @@ URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
+Patch1: 4.9.0_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,6 +47,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%%___*}
@@ -93,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Dec 17 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:340.101-2
+- patch to fix loading module on 4.9 kernel
+
* Wed Dec 14 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:340.101-1
- Update to 340.101
7 years, 11 months
[game-data-packager] update refresh remminder
by Alexandre Detiste
commit 93bdcbeacd9d14c05da3f8a457fd813e739f7671
Author: Alexandre Detiste <alexandre.detiste(a)gmail.com>
Date: Sat Dec 17 10:21:51 2016 +0100
update refresh remminder
game-data-packager.spec | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/game-data-packager.spec b/game-data-packager.spec
index ff20452..708322f 100644
--- a/game-data-packager.spec
+++ b/game-data-packager.spec
@@ -1,12 +1,13 @@
-# How to refresh
+# How to refresh:
#
-# 1) bump "Version:"
-# 2) add changelog entry
-# 3) 'spectool -g game-data-packager.spec'
-# 4) rpmbuild -ba game-data-packager.spec
-# 5) rfpkg commit
-# 6) rfpkg push
-# 7) rfpkg build
+# - bump "Version:"
+# - add changelog entry
+# spectool -g game-data-packager.spec
+# rfpkg new-sources game-data-packager_${version}.tar.xz
+# rpmbuild -ba game-data-packager.spec
+# rfpkg commit
+# rfpkg push
+# rfpkg build
#define gitdate 20160112
# git log --oneline -1
7 years, 11 months
[game-data-packager] new upstream release
by Alexandre Detiste
commit 230fdec314077bf5e3040bd54d54bee3304e4bae
Author: Alexandre Detiste <alexandre.detiste(a)gmail.com>
Date: Sat Dec 17 10:19:58 2016 +0100
new upstream release
.gitignore | 1 +
sources | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/.gitignore b/.gitignore
index 0d2573e..35476ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/game-data-packager_45.tar.xz
/game-data-packager_46.tar.xz
/game-data-packager_47.tar.xz
+/game-data-packager_48.tar.xz
diff --git a/sources b/sources
index 6491879..6f61075 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8dd20bdf3844593a5aea15e338ea9ec9 game-data-packager_47.tar.xz
+510c9b0169377862df65caa3a8579458 game-data-packager_48.tar.xz
7 years, 11 months
