rpms/wl-kmod/devel broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch, NONE, 1.1 broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch, NONE, 1.1 wl-kmod.spec, 1.69, 1.70
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20884
Modified Files:
wl-kmod.spec
Added Files:
broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch
broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch
Log Message:
* Sat Oct 20 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-6
- Added patch to include semaphore.h in wl_iw.h
- Added patch from Archlinux to disable too many "ERROR @wl_cfg80211_get_station..." messages
in /var/log/messages since activation of CFG80211 API
broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch:
wl_cfg80211.c | 5 ++++-
wl_linux.c | 6 +-----
2 files changed, 5 insertions(+), 6 deletions(-)
--- NEW FILE broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch ---
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_cfg80211.c hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_cfg80211.c 2012-10-16 22:04:18.718673254 +0200
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_cfg80211.c 2012-10-20 16:16:20.071738204 +0200
@@ -1478,7 +1478,10 @@
scb_val.val = 0;
err = wl_dev_ioctl(dev, WLC_GET_RSSI, &scb_val, sizeof(scb_val_t));
if (err) {
- WL_ERR(("Could not get rssi (%d)\n", err));
+ if (err != -EINVAL) {
+ // Don't fill syslog with EINVAL error
+ WL_ERR(("Could not get rssi (%d)\n", err));
+ }
return err;
}
rssi = dtoh32(scb_val.val);
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c 2012-10-16 14:26:28.087617125 +0200
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c 2012-10-20 16:16:20.447738352 +0200
@@ -1587,11 +1587,7 @@
}
WL_LOCK(wl);
- if (!capable(CAP_NET_ADMIN)) {
- bcmerror = BCME_EPERM;
- } else {
- bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif);
- }
+ bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif);
WL_UNLOCK(wl);
done1:
broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch:
wl_iw.h | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch ---
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_iw.h hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_iw.h
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_iw.h 2011-10-22 18:56:55.000000000 +0200
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_iw.h 2012-10-20 16:16:20.396738313 +0200
@@ -15,6 +15,7 @@
#ifndef _wl_iw_h_
#define _wl_iw_h_
+#include <linux/semaphore.h>
#include <linux/wireless.h>
#include <typedefs.h>
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- wl-kmod.spec 17 Oct 2012 06:03:55 -0000 1.69
+++ wl-kmod.spec 20 Oct 2012 15:48:16 -0000 1.70
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.100.82.112
-Release: 5%{?dist}.1
+Release: 6%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -20,6 +20,8 @@
Patch2: broadcom-wl-5.100.82.112-kernel-3.4.patch
Patch3: broadcom-wl-5.100.82.112-cfg80211.patch
Patch4: broadcom-wl-5.100.82.112-kernel-3.6.patch
+Patch5: broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch
+Patch6: broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch
BuildRequires: %{_bindir}/kmodtool
@@ -60,6 +62,8 @@
%patch2 -p1 -b .kernel-3.4
%patch3 -p1 -b .cfg80211
%patch4 -p1 -b .kernel-3.6
+%patch5 -p1 -b .recent_kernel_semaphore
+%patch6 -p1 -b .recent_kernel_ioctl
popd
for kernel_version in %{?kernel_versions} ; do
@@ -89,6 +93,11 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Oct 20 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-6
+- Added patch to include semaphore.h in wl_iw.h
+- Added patch from Archlinux to disable too many "ERROR @wl_cfg80211_get_station..." messages
+ in /var/log/messages since activation of CFG80211 API
+
* Wed Oct 17 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-5.1
- Cleaned up patch for kernel >= 3.6
12 years, 1 month
rpms/staging-kmod-addons/F-16 staging-kmod-addons.spec,1.10,1.11
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod-addons/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6194
Modified Files:
staging-kmod-addons.spec
Log Message:
add missing BR
Index: staging-kmod-addons.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-16/staging-kmod-addons.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- staging-kmod-addons.spec 19 Oct 2012 16:28:44 -0000 1.10
+++ staging-kmod-addons.spec 20 Oct 2012 08:37:35 -0000 1.11
@@ -24,6 +24,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel libtool pkgconfig
BuildRequires: libsysfs-devel
+BuildRequires: systemd-units
%description
Documentation for some of the kernel modules from linux-staging.
12 years, 1 month
rpms/xorg-x11-drv-catalyst/F-16 xorg-x11-drv-catalyst.spec,1.10,1.11
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28486
Modified Files:
xorg-x11-drv-catalyst.spec
Log Message:
* Sat Oct 20 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.6-2
- rebuild as buildsystem "bad magic" with last version
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-catalyst.spec 20 Oct 2012 03:27:58 -0000 1.10
+++ xorg-x11-drv-catalyst.spec 20 Oct 2012 04:04:06 -0000 1.11
@@ -5,7 +5,7 @@
%global __strip /bin/true
Name: xorg-x11-drv-catalyst
Version: 12.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
@@ -396,6 +396,9 @@
%changelog
+* Sat Oct 20 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.6-2
+- rebuild as buildsystem "bad magic" with last version
+
* Sat Oct 20 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.6-1
- Update to Catalyst 12.6 legacy (internal version 8.97.100.3)
12 years, 1 month
rpms/catalyst-kmod/F-16 3.5-do_mmap.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 catalyst-kmod.spec, 1.68, 1.69 sources, 1.9, 1.10 catalyst-kmod-i386.patch, 1.1, NONE fglrx_kernel_3.4.0.patch, 1.3, NONE rename_debug.patch, 1.1, NONE
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/catalyst-kmod/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27494
Modified Files:
.cvsignore catalyst-kmod.spec sources
Added Files:
3.5-do_mmap.patch
Removed Files:
catalyst-kmod-i386.patch fglrx_kernel_3.4.0.patch
rename_debug.patch
Log Message:
* Sat Oct 20 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.6-1
- Update to Catalyst 12.6 legacy (internal version 8.97.100.3)
3.5-do_mmap.patch:
firegl_public.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
--- NEW FILE 3.5-do_mmap.patch ---
--- lib/modules/fglrx/build_mod/firegl_public.c 2012-06-15 18:30:13.483762070 +0200
+++ lib/modules/fglrx/build_mod/firegl_public.c 2012-06-17 17:47:36.543041869 +0200
@@ -2106,6 +2106,12 @@
}
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
+# define NO_DO_MMAP
+# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f)
+# define do_munmap(a,b,c) vm_munmap(b, c)
+#endif
+
unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval(
KCL_IO_FILE_Handle file,
unsigned long addr,
@@ -2117,10 +2123,13 @@
flags = MAP_SHARED;
prot = PROT_READ|PROT_WRITE;
-
+#ifdef NO_DO_MMAP
+ vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff);
+#else
down_write(¤t->mm->mmap_sem);
vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff);
up_write(¤t->mm->mmap_sem);
+#endif
if (IS_ERR(vaddr))
return 0;
else
@@ -2131,7 +2140,9 @@
{
int retcode = 0;
+#ifndef NO_DO_MMAP
down_write(¤t->mm->mmap_sem);
+#endif
#ifdef FGL_LINUX_RHEL_MUNMAP_API
retcode = do_munmap(current->mm,
addr,
@@ -2142,7 +2153,9 @@
addr,
len);
#endif
+#ifndef NO_DO_MMAP
up_write(¤t->mm->mmap_sem);
+#endif
return retcode;
}
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 27 Apr 2012 12:43:19 -0000 1.9
+++ .cvsignore 20 Oct 2012 03:39:42 -0000 1.10
@@ -1 +1 @@
-catalyst-kmod-data-12.4.tar.bz2
+catalyst-kmod-data-12.6.tar.bz2
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/catalyst-kmod.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- catalyst-kmod.spec 18 Oct 2012 18:43:51 -0000 1.68
+++ catalyst-kmod.spec 20 Oct 2012 03:39:42 -0000 1.69
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+%define buildforkernels current
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -12,8 +12,8 @@
%endif
Name: catalyst-kmod
-Version: 12.4
-Release: 4%{?dist}.13
+Version: 12.6
+Release: 1%{?dist}
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -22,9 +22,8 @@
Source0: http://downloads.diffingo.com/rpmfusion/kmod-data/catalyst-kmod-data-%{ve...
Source11: catalyst-kmodtool-excludekernel-filterfile
Patch0: compat_alloc-Makefile.patch
-Patch1: rename_debug.patch
-Patch2: catalyst-kmod-i386.patch
-Patch3: fglrx_kernel_3.4.0.patch
+Patch1: 3.5-do_mmap.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i686
@@ -70,11 +69,7 @@
pushd fglrxpkg
%patch0 -p0 -b.compat_alloc
-%patch1 -p0 -b.rename_debug
-%patch3 -p0 -b.fglrx_kernel_3.4.0
-%ifarch %{ix86}
-%patch2 -p0 -b.catalyst-kmod-i386
-%endif
+%patch1 -p0 -b.3.5-do_mmap
popd
for kernel_version in %{?kernel_versions} ; do
@@ -105,6 +100,9 @@
%changelog
+* Sat Oct 20 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.6-1
+- Update to Catalyst 12.6 legacy (internal version 8.97.100.3)
+
* Thu Oct 18 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 12.4-4.13
- Rebuilt for updated kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 27 Apr 2012 12:43:19 -0000 1.9
+++ sources 20 Oct 2012 03:39:42 -0000 1.10
@@ -1 +1 @@
-a7435617867b5bdef827ecf3d46902c4 catalyst-kmod-data-12.4.tar.bz2
+8e414e62c1df2835f823a8c188765ede catalyst-kmod-data-12.6.tar.bz2
--- catalyst-kmod-i386.patch DELETED ---
--- fglrx_kernel_3.4.0.patch DELETED ---
--- rename_debug.patch DELETED ---
12 years, 1 month
rpms/xorg-x11-drv-catalyst/F-16 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xorg-x11-drv-catalyst.spec, 1.9, 1.10
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26797
Modified Files:
.cvsignore sources xorg-x11-drv-catalyst.spec
Log Message:
* Sat Oct 20 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.6-1
- Update to Catalyst 12.6 legacy (internal version 8.97.100.3)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 27 Apr 2012 12:27:33 -0000 1.9
+++ .cvsignore 20 Oct 2012 03:27:58 -0000 1.10
@@ -1,2 +1,3 @@
amd-driver-installer-12-3-x86.x86_64.run
amd-driver-installer-12-4-x86.x86_64.run
+amd-driver-installer-12.6-legacy-x86.x86_64.zip
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 27 Apr 2012 12:27:33 -0000 1.9
+++ sources 20 Oct 2012 03:27:58 -0000 1.10
@@ -1,2 +1,2 @@
-e57d65cb9c9fa470d6d80072d5ab2785 amd-driver-installer-12-4-x86.x86_64.run
b8f56bc55aa70cb19dd12857fdc184cc xvba-sdk-0.74-404001.tar.gz
+eada88ea8ec12e09f516527b5a5d55d6 amd-driver-installer-12.6-legacy-x86.x86_64.zip
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-catalyst.spec 27 Apr 2012 12:27:33 -0000 1.9
+++ xorg-x11-drv-catalyst.spec 20 Oct 2012 03:27:58 -0000 1.10
@@ -1,16 +1,16 @@
-%define atilibdir %{_libdir}/catalyst
-
+%global atilibdir %{_libdir}/catalyst
+%global amdrun amd-driver-installer-12.6-legacy-x86.x86_64.run
%global debug_package %{nil}
%global __strip /bin/true
Name: xorg-x11-drv-catalyst
-Version: 12.4
+Version: 12.6
Release: 1%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
URL: http://www.ati.com/support/drivers/linux/radeon-linux.html
-Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/amd-dri...
+Source0: http://www2.ati.com/drivers/legacy/12-6/amd-driver-installer-12.6-legacy-...
Source1: http://developer.amd.com/downloads/xvba-sdk-0.74-404001.tar.gz
Source2: catalyst-README.Fedora
Source3: amdcccle.desktop
@@ -109,8 +109,10 @@
%prep
%setup -q -c -T
+# Unzip fglrx driver
+unzip %{SOURCE0}
# Extract fglrx driver
-sh %{SOURCE0} --extract fglrx
+sh %{amdrun} --extract fglrx
# Extract XvBA devel files
mkdir amdxvba
@@ -394,6 +396,9 @@
%changelog
+* Sat Oct 20 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.6-1
+- Update to Catalyst 12.6 legacy (internal version 8.97.100.3)
+
* Fri Apr 27 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.4-1
- Update to Catalyst 12.4 (internal version 8.961)
12 years, 1 month
rpms/vlc/devel vlc.spec,1.163,1.164
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16088
Modified Files:
vlc.spec
Log Message:
Fix loader
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- vlc.spec 19 Oct 2012 21:19:01 -0000 1.163
+++ vlc.spec 19 Oct 2012 21:30:27 -0000 1.164
@@ -331,7 +331,7 @@
#Clear execstak
%ifarch %{ix86}
-execstack -c $RPM_BUILD_ROOT%{_libdir}/vlc/plugins/codec/libdmo_plugin.so
+#execstack -c $RPM_BUILD_ROOT%{_libdir}/vlc/plugins/codec/libdmo_plugin.so
execstack -c $RPM_BUILD_ROOT%{_libdir}/vlc/plugins/codec/librealvideo_plugin.so
%endif
12 years, 1 month
rpms/vlc/F-17 vlc-2.0.4-cache.patch, NONE, 1.1 vlc.spec, 1.155, 1.156 vlc-1.1.8-bugfix.opencv22.patch, 1.1, NONE vlc-2.0.1-fftype.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15992/F-17
Modified Files:
vlc.spec
Added Files:
vlc-2.0.4-cache.patch
Removed Files:
vlc-1.1.8-bugfix.opencv22.patch vlc-2.0.1-fftype.patch
Log Message:
Enable opus
vlc-2.0.4-cache.patch:
Makefile.am | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--- NEW FILE vlc-2.0.4-cache.patch ---
diff -up vlc-2.0.4/bin/Makefile.am.cache vlc-2.0.4/bin/Makefile.am
--- vlc-2.0.4/bin/Makefile.am.cache 2011-12-08 19:00:25.000000000 +0100
+++ vlc-2.0.4/bin/Makefile.am 2012-10-19 23:14:23.302736639 +0200
@@ -80,7 +80,5 @@ MOSTLYCLEANFILES = $(noinst_DATA)
../modules/plugins.dat: vlc-cache-gen$(EXEEXT)
$(AM_V_at)rm -f ../modules/plugins.dat
$(AM_V_GEN)if test "$(build)" = "$(host)"; then \
- ./vlc-cache-gen$(EXEEXT) ../modules ; \
- else \
- echo "Cross-compilation: cache generation skipped!" ; \
+ echo "Builder compilation: cache generation skipped!" ; \
fi
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-17/vlc.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- vlc.spec 19 Oct 2012 15:36:31 -0000 1.155
+++ vlc.spec 19 Oct 2012 21:30:04 -0000 1.156
@@ -1,5 +1,5 @@
#global vlc_rc -rc1
-#global _with_bootstrap 1
+%global _with_bootstrap 1
%global _with_workaround_circle_deps 1
%if 0%{?!_without_freeworld:1}
%global _with_a52dec --with-a52dec
@@ -37,6 +37,7 @@
URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
Patch0: vlc-2.0.2-xcb_discard.patch
+Patch1: vlc-2.0.4-cache.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -120,6 +121,7 @@
BuildRequires: ncurses-devel
%{?_with_opencv:BuildRequires: opencv-devel}
BuildRequires: openslp-devel
+Buildrequires: opus-devel
BuildRequires: pcre-devel
BuildRequires: pulseaudio-libs-devel >= 0.9.8
BuildRequires: portaudio-devel
@@ -225,6 +227,7 @@
touch -r config.h.in configure configure.ac
}
%endif
+%patch1 -p1 -b .vlc_cache
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
@@ -283,14 +286,14 @@
--enable-ncurses \
--enable-fbosd \
--enable-lirc \
-%ifarch %{ix86}
+%if 0
--enable-loader \
%else
--without-contrib \
%endif
-%if 0
+%if 1
# remove rpath from libtool
sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -328,7 +331,7 @@
#Clear execstak
%ifarch %{ix86}
-execstack -c $RPM_BUILD_ROOT%{_libdir}/vlc/plugins/codec/libdmo_plugin.so
+#execstack -c $RPM_BUILD_ROOT%{_libdir}/vlc/plugins/codec/libdmo_plugin.so
execstack -c $RPM_BUILD_ROOT%{_libdir}/vlc/plugins/codec/librealvideo_plugin.so
%endif
@@ -513,6 +516,9 @@
%changelog
* Fri Oct 19 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.4-1
- Update to 2.0.4
+- Enable opus
+- Disable x86 loader
+- Avoid rpath
* Wed Sep 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.3-3
- Fix --with fluidsynth typo
--- vlc-1.1.8-bugfix.opencv22.patch DELETED ---
--- vlc-2.0.1-fftype.patch DELETED ---
12 years, 1 month
rpms/vlc/F-18 vlc-2.0.4-cache.patch,NONE,1.1 vlc.spec,1.162,1.163
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15754/F-18
Modified Files:
vlc.spec
Added Files:
vlc-2.0.4-cache.patch
Log Message:
Enable Opus
vlc-2.0.4-cache.patch:
Makefile.am | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--- NEW FILE vlc-2.0.4-cache.patch ---
diff -up vlc-2.0.4/bin/Makefile.am.cache vlc-2.0.4/bin/Makefile.am
--- vlc-2.0.4/bin/Makefile.am.cache 2011-12-08 19:00:25.000000000 +0100
+++ vlc-2.0.4/bin/Makefile.am 2012-10-19 23:14:23.302736639 +0200
@@ -80,7 +80,5 @@ MOSTLYCLEANFILES = $(noinst_DATA)
../modules/plugins.dat: vlc-cache-gen$(EXEEXT)
$(AM_V_at)rm -f ../modules/plugins.dat
$(AM_V_GEN)if test "$(build)" = "$(host)"; then \
- ./vlc-cache-gen$(EXEEXT) ../modules ; \
- else \
- echo "Cross-compilation: cache generation skipped!" ; \
+ echo "Builder compilation: cache generation skipped!" ; \
fi
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-18/vlc.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- vlc.spec 19 Oct 2012 14:41:59 -0000 1.162
+++ vlc.spec 19 Oct 2012 21:28:54 -0000 1.163
@@ -1,5 +1,5 @@
#global vlc_rc -rc1
-#global _with_bootstrap 1
+%global _with_bootstrap 1
%global _with_workaround_circle_deps 1
%if 0%{?!_without_freeworld:1}
%global _with_a52dec --with-a52dec
@@ -37,6 +37,7 @@
URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
Patch0: vlc-2.0.2-xcb_discard.patch
+Patch1: vlc-2.0.4-cache.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -120,6 +121,7 @@
BuildRequires: ncurses-devel
%{?_with_opencv:BuildRequires: opencv-devel}
BuildRequires: openslp-devel
+Buildrequires: opus-devel
BuildRequires: pcre-devel
BuildRequires: pulseaudio-libs-devel >= 0.9.8
BuildRequires: portaudio-devel
@@ -225,6 +227,7 @@
touch -r config.h.in configure configure.ac
}
%endif
+%patch1 -p1 -b .vlc_cache
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
@@ -283,14 +286,14 @@
--enable-ncurses \
--enable-fbosd \
--enable-lirc \
-%ifarch %{ix86}
+%if 0
--enable-loader \
%else
--without-contrib \
%endif
-%if 0
+%if 1
# remove rpath from libtool
sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -328,7 +331,7 @@
#Clear execstak
%ifarch %{ix86}
-execstack -c $RPM_BUILD_ROOT%{_libdir}/vlc/plugins/codec/libdmo_plugin.so
+#execstack -c $RPM_BUILD_ROOT%{_libdir}/vlc/plugins/codec/libdmo_plugin.so
execstack -c $RPM_BUILD_ROOT%{_libdir}/vlc/plugins/codec/librealvideo_plugin.so
%endif
@@ -513,6 +516,9 @@
%changelog
* Fri Oct 19 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.4-1
- Update to 2.0.4
+- Enable opus
+- Disable x86 loader
+- Avoid rpath
* Wed Sep 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.3-3
- Fix --with fluidsynth typo
12 years, 1 month
rpms/vlc/devel vlc-2.0.4-cache.patch,NONE,1.1 vlc.spec,1.162,1.163
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15210/devel
Modified Files:
vlc.spec
Added Files:
vlc-2.0.4-cache.patch
Log Message:
Enable opus
vlc-2.0.4-cache.patch:
Makefile.am | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--- NEW FILE vlc-2.0.4-cache.patch ---
diff -up vlc-2.0.4/bin/Makefile.am.cache vlc-2.0.4/bin/Makefile.am
--- vlc-2.0.4/bin/Makefile.am.cache 2011-12-08 19:00:25.000000000 +0100
+++ vlc-2.0.4/bin/Makefile.am 2012-10-19 23:14:23.302736639 +0200
@@ -80,7 +80,5 @@ MOSTLYCLEANFILES = $(noinst_DATA)
../modules/plugins.dat: vlc-cache-gen$(EXEEXT)
$(AM_V_at)rm -f ../modules/plugins.dat
$(AM_V_GEN)if test "$(build)" = "$(host)"; then \
- ./vlc-cache-gen$(EXEEXT) ../modules ; \
- else \
- echo "Cross-compilation: cache generation skipped!" ; \
+ echo "Builder compilation: cache generation skipped!" ; \
fi
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- vlc.spec 19 Oct 2012 14:41:58 -0000 1.162
+++ vlc.spec 19 Oct 2012 21:19:01 -0000 1.163
@@ -1,5 +1,5 @@
#global vlc_rc -rc1
-#global _with_bootstrap 1
+%global _with_bootstrap 1
%global _with_workaround_circle_deps 1
%if 0%{?!_without_freeworld:1}
%global _with_a52dec --with-a52dec
@@ -37,6 +37,7 @@
URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
Patch0: vlc-2.0.2-xcb_discard.patch
+Patch1: vlc-2.0.4-cache.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -120,6 +121,7 @@
BuildRequires: ncurses-devel
%{?_with_opencv:BuildRequires: opencv-devel}
BuildRequires: openslp-devel
+Buildrequires: opus-devel
BuildRequires: pcre-devel
BuildRequires: pulseaudio-libs-devel >= 0.9.8
BuildRequires: portaudio-devel
@@ -225,6 +227,7 @@
touch -r config.h.in configure configure.ac
}
%endif
+%patch1 -p1 -b .vlc_cache
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
@@ -283,14 +286,14 @@
--enable-ncurses \
--enable-fbosd \
--enable-lirc \
-%ifarch %{ix86}
+%if 0
--enable-loader \
%else
--without-contrib \
%endif
-%if 0
+%if 1
# remove rpath from libtool
sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -513,6 +516,9 @@
%changelog
* Fri Oct 19 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.4-1
- Update to 2.0.4
+- Enable opus
+- Disable x86 loader
+- Avoid rpath
* Wed Sep 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.3-3
- Fix --with fluidsynth typo
12 years, 1 month
rpms/xtables-addons-kmod/F-16 xtables-addons-kmod.spec,1.64,1.65
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xtables-addons-kmod/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13406/F-16
Modified Files:
xtables-addons-kmod.spec
Log Message:
Fix for F-16
Index: xtables-addons-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/F-16/xtables-addons-kmod.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- xtables-addons-kmod.spec 19 Oct 2012 14:44:35 -0000 1.64
+++ xtables-addons-kmod.spec 19 Oct 2012 20:31:37 -0000 1.65
@@ -57,9 +57,9 @@
%install
for kernel_version in %{?kernel_versions} ; do
export XA_ABSTOPSRCDIR=${PWD}/_kmod_build_${kernel_version%%___*}
- make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" M=${PWD}/_kmod_build_${kernel_version%%___*}/extensions _emodinst_ INSTALL_MOD_PATH=%{buildroot}%{_prefix} ext-mod-dir=%{kmodinstdir_postfix}
+ make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" M=${PWD}/_kmod_build_${kernel_version%%___*}/extensions _emodinst_ INSTALL_MOD_PATH=%{buildroot} ext-mod-dir=%{kmodinstdir_postfix}
done
-chmod u+x %{buildroot}%{_prefix}/lib/modules/*/extra/*/*
+chmod u+x %{buildroot}/lib/modules/*/extra/*/*
%{?akmod_install}
%clean
12 years, 1 month
