rpms/motion/F-18 motion-0001-emit-asm-emms-only-on-x86-and-amd64-arches.patch, NONE, 1.1 motion.spec, 1.18, 1.19
by Tomasz Torcz
Author: ttorcz
Update of /cvs/free/rpms/motion/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10315
Modified Files:
motion.spec
Added Files:
motion-0001-emit-asm-emms-only-on-x86-and-amd64-arches.patch
Log Message:
* Mon Dec 03 2012 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.1
- add patch to hopefuly fix ARM compilation
motion-0001-emit-asm-emms-only-on-x86-and-amd64-arches.patch:
ffmpeg.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE motion-0001-emit-asm-emms-only-on-x86-and-amd64-arches.patch ---
>From dcb186cb3ad6666d66aba6453031203ba1f6c15a Mon Sep 17 00:00:00 2001
From: Tomasz Torcz <tomek(a)pipebreaker.pl>
Date: Mon, 3 Dec 2012 14:25:50 +0100
Subject: [PATCH] emit asm "emms" only on x86 and amd64 arches
Fixes compilation error on ARM:
armv5tel - Error: bad instruction `emms`
---
ffmpeg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 1c2ae47..57eeda4 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1000,7 +1000,7 @@ void ffmpeg_deinterlace(unsigned char *img, int width, int height)
/* We assume using 'PIX_FMT_YUV420P' always */
avpicture_deinterlace(&picture, &picture, PIX_FMT_YUV420P, width, height);
-#ifndef __SSE_MATH__
+#if !defined(__SSE_MATH__) && (defined(__i386__) || defined(__x86_64__))
__asm__ __volatile__ ( "emms");
#endif
--
1.7.11.7
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/F-18/motion.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- motion.spec 2 Dec 2012 15:13:46 -0000 1.18
+++ motion.spec 3 Dec 2012 18:49:28 -0000 1.19
@@ -1,12 +1,13 @@
Name: motion
Version: 3.3.0
-Release: trunkREV557%{?dist}
+Release: trunkREV557.1%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome
Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0: motion-0001-emit-asm-emms-only-on-x86-and-amd64-arches.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel ffmpeg-devel zlib-devel
@@ -26,6 +27,7 @@
%prep
%setup -q
+%patch0 -p1
%build
%configure --sysconfdir=%{_sysconfdir}/%{name} --without-optimizecpu --with-ffmpeg --without-mysql --without-pgsql
@@ -95,6 +97,9 @@
%attr(0755,root,root) %{_initrddir}/%{name}
%changelog
+* Mon Dec 03 2012 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.1
+- add patch to hopefuly fix ARM compilation
+
* Sun Dec 02 2012 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557
- package newest trunk, fixing #2586
11 years, 4 months
rpms/VirtualBox/devel VirtualBox-4.2.4-no-bundles.patch, NONE, 1.1 VirtualBox-4.1.20-x113.patch, 1.2, 1.3 VirtualBox.spec, 1.31, 1.32 VirtualBox-4.2.0-xorg17.patch, 1.6, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28947
Modified Files:
VirtualBox-4.1.20-x113.patch VirtualBox.spec
Added Files:
VirtualBox-4.2.4-no-bundles.patch
Removed Files:
VirtualBox-4.2.0-xorg17.patch
Log Message:
* Sun Dec 02 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-3
- Use global variables enable_webservice and enable_docs to deal better with enable and disable that.
- Include fr UserManual.pdf and put this docs in /usr/share/docs (the right place) .
- Unbundle sources that aren't used.
VirtualBox-4.2.4-no-bundles.patch:
Config.kmk | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--- NEW FILE VirtualBox-4.2.4-no-bundles.patch ---
--- ./Config.kmk.libcxx 2012-10-26 17:23:13.000000000 +0100
+++ ./Config.kmk 2012-11-24 14:46:31.187664914 +0000
@@ -2587,26 +2587,25 @@ VBOXLNX32GUEST_SUFF_LIB = .a
# SDKs for external libraries.
#
SDK_VBOX_LIBXML2 = .
-SDK_VBOX_LIBXML2_INCS ?= $(PATH_ROOT)/src/libs/libxml2-2.6.31/include
+SDK_VBOX_LIBXML2_INCS ?= /usr/include/libxml2
SDK_VBOX_LIBXML2_DEFS ?= _REENTRANT
SDK_VBOX_LIBXML2_DEFS.win += WIN32 _WINDOWS _MBCS
# note: no linking to LIB here, we do that explicitly in src/VBox/Runtime/Makefile.kmk to link
# libxml against VBoxRT
SDK_VBOX_LIBPNG = .
-SDK_VBOX_LIBPNG_INCS ?= $(PATH_ROOT)/src/libs/libpng-1.2.8
+SDK_VBOX_LIBPNG_INCS ?= /usr/include/libpng15
SDK_VBOX_LIBPNG_LIBS ?= $(PATH_STAGE_LIB)/VBox-libpng$(VBOX_SUFF_LIB)
SDK_VBOX_ZLIB = .
if1of ($(KBUILD_TARGET), os2 solaris win)
- SDK_VBOX_ZLIB_INCS ?= $(PATH_ROOT)/src/libs/zlib-1.2.6
+ SDK_VBOX_ZLIB_INCS ?= /usr/include/
SDK_VBOX_ZLIB_LIBS ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB)
else
SDK_VBOX_ZLIB_INCS ?=
SDK_VBOX_ZLIB_LIBS ?= z
SDK_VBOX_ZLIB_DEFS.linux ?= _LARGEFILE64_SOURCE
endif
-
SDK_VBOX_OPENSSL = Only for VBoxRT and/or statically linked programs.
SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS := $(PATH_OUT)/obj/crypto-headers/include
SDK_VBOX_OPENSSL_INCS ?= $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)
VirtualBox-4.1.20-x113.patch:
vboxvideo.c | 55 +++++++++++++++++++++++--------------------------------
vboxvideo.h | 2 +-
vboxvideo_dri.c | 4 ++--
3 files changed, 26 insertions(+), 35 deletions(-)
Index: VirtualBox-4.1.20-x113.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-4.1.20-x113.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VirtualBox-4.1.20-x113.patch 7 Sep 2012 03:03:37 -0000 1.2
+++ VirtualBox-4.1.20-x113.patch 2 Dec 2012 22:53:34 -0000 1.3
@@ -1,4 +1,4 @@
-X.org 1.13 patch
+X.org 1.13 patch , not in use, just stay for references.
Reference:
http://www.mail-archive.com/xorg-devel@lists.x.org/msg30282.html
[PATCH 01/19] xserver: remove index from CloseScreen (API/ABI breakage) Dave Airlie
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- VirtualBox.spec 29 Oct 2012 05:22:27 -0000 1.31
+++ VirtualBox.spec 2 Dec 2012 22:53:34 -0000 1.32
@@ -13,9 +13,21 @@
#global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
+%if 0%{?fedora} < 18
+%global enable_webservice 1
+%else
+%global enable_webservice 0
+%endif
+
+%if 0%{?fedora} < 18
+%global enable_docs 1
+%else
+%global enable_docs 0
+%endif
+
Name: VirtualBox
Version: 4.2.4
-Release: 2%{?prerel:.%{prerel}}%{?dist}
+Release: 3%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -43,6 +55,7 @@
Patch23: VirtualBox-4.2.0-mesa.patch
Patch24: VirtualBox-4.2.0-VBoxGuestLib.patch
Patch25: VirtualBox-4.2.0-xorg111.patch
+Patch26: VirtualBox-4.2.4-no-bundles.patch
%if 0%{?fedora} < 16
BuildRequires: kBuild >= 0.1.98
@@ -63,7 +76,11 @@
BuildRequires: mkisofs
BuildRequires: java-devel >= 1.6
BuildRequires: /usr/bin/pdflatex
+BuildRequires: boost-devel
+#BuildRequires: liblzf-devel
+BuildRequires: libxml2-devel
BuildRequires: libpng-devel
+BuildRequires: zlib-devel
#BuildRequires: glibc(x86-32) glibc-devel(x86-32) libstdc++(x86-32)
#BuildRequires: glibc.i686 glibc-devel.i686 libstdc++.i686
#BuildRequires: /usr/lib/libc.so
@@ -195,6 +212,8 @@
%patch25 -p1 -b .xorg111
%endif
+%patch26 -p1 -b .nobundles
+
# Remove prebuilt binary tools
%if 0%{?fedora} < 16
rm -rf kBuild
@@ -204,18 +223,29 @@
# Remove some bundle X11 sources.
rm -rf src/VBox/Additions/x11/x11include
rm -rf src/VBox/Additions/x11/x11stubs
+rm -rf src/libs/boost-1.37.0/
+#rm -rf src/libs/liblzf-3.4/
+rm -rf src/libs/libxml2-2.6.31/
+rm -rf src/libs/libpng-1.2.8/
+rm -rf src/libs/zlib-1.2.6/
# CRLF->LF
sed -i 's/\r//' COPYING
+# Testings
+#for S in doc/manual/fr_FR/*xml
+#do
+# sed -i 's/[&][a-zA-Z0-9]\{2,5\}[;]/ /g' $S
+#done
%build
./configure --disable-kmods \
-%if 0%{?fedora} > 17
- --disable-docs
+%if %{enable_webservice}
+ --enable-webservice \
%endif
-%if 0%{?fedora} < 18
- --enable-webservice
+%if %{enable_docs}
+%else
+ --disable-docs \
%endif
#--disable-java
@@ -274,7 +304,7 @@
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxheadless
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxballoonctrl
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
%endif
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBFE
@@ -296,13 +326,6 @@
obj/bin/V*.r0 \
obj/bin/VBoxEFI*.fd
-# Documentation
-%if 0%{?fedora} < 18
-install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
- obj/bin/UserManual.pdf
-%endif
-
-
# Executables
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
obj/bin/VBoxHeadless \
@@ -318,7 +341,7 @@
obj/bin/VBoxTestOGL \
obj/bin/VBoxExtPackHelperApp \
obj/bin/VBoxBalloonCtrl \
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
obj/bin/vboxwebsrv \
obj/bin/webtest \
%endif
@@ -448,6 +471,7 @@
systemctl restart udev-trigger.service
systemctl restart udev-settle.service
fi
+# should be in kmod package, not here
/bin/systemctl try-restart fedora-loadmodules.service >/dev/null 2>&1 || :
%preun
@@ -477,6 +501,7 @@
%post guest
/sbin/ldconfig
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+# should be in kmod package, not here
/bin/systemctl try-restart fedora-loadmodules.service >/dev/null 2>&1 || :
/bin/systemctl enable vboxservice.service >/dev/null 2>&1 || :
/bin/systemctl restart vboxservice.service >/dev/null 2>&1 || :
@@ -507,14 +532,11 @@
%{_bindir}/VBoxTunctl
%{_bindir}/virtualbox
%{_bindir}/VirtualBox
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
%{_bindir}/vboxwebsrv
%endif
%{_bindir}/VBoxVRDP
-%if 0%{?fedora} < 18
%dir %{_libdir}/virtualbox
-%doc %{_libdir}/virtualbox/*.pdf
-%endif
%{_libdir}/virtualbox/*.[^p]*
%{_libdir}/virtualbox/*.py*
%{_libdir}/virtualbox/components
@@ -525,7 +547,7 @@
%{_libdir}/virtualbox/VBoxTestOGL
%{_libdir}/virtualbox/VBoxXPCOMIPCD
%{_libdir}/virtualbox/VBoxBalloonCtrl
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
%{_libdir}/virtualbox/vboxwebsrv
%{_libdir}/virtualbox/webtest
%endif
@@ -543,7 +565,11 @@
%config %{_sysconfdir}/vbox/vbox.cfg
%config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}.modules
-%doc COPYING
+%doc COPYING*
+%doc doc/*.*
+%if %{enable_docs}
+%doc obj/bin/UserManual*.pdf
+%endif
%{_unitdir}/vboxweb.service
/lib/udev/VBoxCreateUSBNode.sh
@@ -581,6 +607,11 @@
%changelog
+* Sun Dec 02 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-3
+- Use global variables enable_webservice and enable_docs to deal better with enable and disable that.
+- Include fr UserManual.pdf and put this docs in /usr/share/docs (the right place) .
+- Unbundle sources that aren't used.
+
* Mon Oct 29 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-2
- Try load new vbox modules right after install or upgrade.
- Try better reload of vboxservice.service when as guest system.
--- VirtualBox-4.2.0-xorg17.patch DELETED ---
11 years, 4 months
rpms/motion/F-18 sources,1.9,1.10
by Tomasz Torcz
Author: ttorcz
Update of /cvs/free/rpms/motion/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8954
Modified Files:
sources
Log Message:
trunk REV557
Index: sources
===================================================================
RCS file: /cvs/free/rpms/motion/F-18/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 1 Oct 2011 13:03:24 -0000 1.9
+++ sources 2 Dec 2012 15:41:46 -0000 1.10
@@ -1 +1 @@
-ecc497ec9307aef283c1bc0cae3adf4e motion-3.3.0.tar.gz
+a11826f948e0d99120b32123679d5fc5 motion-3.3.0.tar.gz
11 years, 4 months
rpms/motion/F-18 motion.spec,1.17,1.18
by Tomasz Torcz
Author: ttorcz
Update of /cvs/free/rpms/motion/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8364
Modified Files:
motion.spec
Log Message:
* Sun Dec 02 2012 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557
- package newest trunk, fixing #2586
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/F-18/motion.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- motion.spec 24 Nov 2012 15:23:10 -0000 1.17
+++ motion.spec 2 Dec 2012 15:13:46 -0000 1.18
@@ -1,6 +1,6 @@
Name: motion
Version: 3.3.0
-Release: trunkREV534%{?dist}.4
+Release: trunkREV557%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
@@ -95,6 +95,9 @@
%attr(0755,root,root) %{_initrddir}/%{name}
%changelog
+* Sun Dec 02 2012 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557
+- package newest trunk, fixing #2586
+
* Sat Nov 24 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3.0-trunkREV534.4
- Rebuilt for FFmpeg 1.0
11 years, 4 months
rpms/nvidia-settings/devel .cvsignore, 1.23, 1.24 nvidia-settings.spec, 1.26, 1.27 sources, 1.23, 1.24
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-settings/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9997
Modified Files:
.cvsignore nvidia-settings.spec sources
Log Message:
* Sat Dec 01 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-28
- Update to 310.19
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 16 Oct 2012 21:55:28 -0000 1.23
+++ .cvsignore 1 Dec 2012 12:11:21 -0000 1.24
@@ -1 +1 @@
-nvidia-settings-310.14.tar.bz2
+nvidia-settings-310.19.tar.bz2
Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/nvidia-settings.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- nvidia-settings.spec 16 Oct 2012 21:55:28 -0000 1.26
+++ nvidia-settings.spec 1 Dec 2012 12:11:21 -0000 1.27
@@ -1,7 +1,7 @@
# We use the driver version as a snapshot internal number
# The real version of the package remains 1.0
# This will prevent missunderstanding and versioning changes on the nvidia driver
-%global nversion 310.14
+%global nversion 310.19
#Possible replacement/complement:
#http://willem.engen.nl/projects/disper/
@@ -9,7 +9,7 @@
Name: nvidia-settings
Version: 1.0
-Release: 27%{?dist}
+Release: 28%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
@@ -100,6 +100,9 @@
%changelog
+* Sat Dec 01 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-28
+- Update to 310.19
+
* Tue Oct 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-27
- Update to 310.14
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 16 Oct 2012 21:55:29 -0000 1.23
+++ sources 1 Dec 2012 12:11:21 -0000 1.24
@@ -1 +1 @@
-ba601f28bd9a4649af117d9e006e2225 nvidia-settings-310.14.tar.bz2
+30e2775ac719af9443b12549d0cd8852 nvidia-settings-310.19.tar.bz2
11 years, 4 months