rpms/staging-kmod/F-16 staging-kmod.spec,1.50,1.51
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16377/F-16
Modified Files:
staging-kmod.spec
Log Message:
* Mon Apr 30 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.3-2.1
- make a few things more robust for drivers that have subdirectories (fixes
#2265)
- enbable a few options r8192e driver needs since 3.3
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-16/staging-kmod.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- staging-kmod.spec 22 Apr 2012 10:57:10 -0000 1.50
+++ staging-kmod.spec 30 Apr 2012 19:13:02 -0000 1.51
@@ -20,7 +20,7 @@
Name: staging-kmod
Version: 3.3
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.7
+Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}.1
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -50,7 +50,7 @@
%setup -q -c -T -a 0
# disable drivers that are enabled in Fedora's kernel, as those otherweise would get build
-sed -i 's|.*DABUSB.*||; s|.*SE401.*||; s|.*VICAM.*||; s|.CRYSTALH||; s|.*LIRC.*||;' linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/Makefile
+sed -i 's|.*DABUSB.*||; s|.*SE401.*||; s|.*VICAM.*||; s|.CRYSTALH||; s|.*LIRC.*||;' $(find linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/ -name 'Makefile')
# seperate directories for each kernel variant (PAE, non-PAE, ...) we build the modules for
for kernel_version in %{?kernel_versions} ; do
@@ -86,6 +86,9 @@
R8712U)
configops="${configops} CONFIG_R8712_AP=y"
;;
+ RTL8192E)
+ configops="${configops} CONFIG_RTLLIB=m RTLLIB_CRYPTO_CCMP=m RTLLIB_CRYPTO_TKIP=m RTLLIB_CRYPTO_WEP=m "
+ ;;
SLICOSS)
# does not build on ppc and ppc64 as of 011109; tested with 2.6.30.9 and 2.6.31.5
( [[ "%{_target_cpu}" == "ppc" ]] || [[ "%{_target_cpu}" == "ppc64" ]] ) && continue
@@ -114,7 +117,7 @@
rm -rf ${RPM_BUILD_ROOT}
for kernel_version in %{?kernel_versions}; do
mkdir -p ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
- install -D -m 755 _kmod_build_${kernel_version%%___*}/drivers/staging/*/*.ko ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
+ install -D -m 755 -t ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ $(find _kmod_build_${kernel_version%%___*}/drivers/staging/ -name '*.ko')
done
# akmods hint:
# no akomds for now; packager is working on a solution where each driver will get its own akmod
@@ -127,23 +130,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
-* Sun Apr 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.7
-- rebuild for updated kernel
-
-* Mon Apr 16 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.6
-- rebuild for updated kernel
-
-* Thu Apr 12 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.5
-- rebuild for updated kernel
-
-* Sat Apr 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.4
-- rebuild for updated kernel
-
-* Tue Apr 03 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.3
-- rebuild for updated kernel
-
-* Fri Mar 30 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.2
-- rebuild for updated kernel
+* Mon Apr 30 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.3-2.1
+- make a few things more robust for drivers that have subdirectories (fixes
+ #2265)
+- enbable a few options r8192e driver needs since 3.3
* Wed Mar 21 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.3-1.1
- update to 3.3
11 years, 11 months
rpms/staging-kmod/F-15 staging-kmod.spec,1.59,1.60
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod/F-15
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16377/F-15
Modified Files:
staging-kmod.spec
Log Message:
* Mon Apr 30 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.3-2.1
- make a few things more robust for drivers that have subdirectories (fixes
#2265)
- enbable a few options r8192e driver needs since 3.3
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-15/staging-kmod.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- staging-kmod.spec 22 Apr 2012 10:59:08 -0000 1.59
+++ staging-kmod.spec 30 Apr 2012 19:13:01 -0000 1.60
@@ -20,7 +20,7 @@
Name: staging-kmod
Version: 3.3
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.6
+Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}.1
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -50,7 +50,7 @@
%setup -q -c -T -a 0
# disable drivers that are enabled in Fedora's kernel, as those otherweise would get build
-sed -i 's|.*DABUSB.*||; s|.*SE401.*||; s|.*VICAM.*||; s|.CRYSTALH||; s|.*LIRC.*||;' linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/Makefile
+sed -i 's|.*DABUSB.*||; s|.*SE401.*||; s|.*VICAM.*||; s|.CRYSTALH||; s|.*LIRC.*||;' $(find linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/ -name 'Makefile')
# seperate directories for each kernel variant (PAE, non-PAE, ...) we build the modules for
for kernel_version in %{?kernel_versions} ; do
@@ -86,6 +86,9 @@
R8712U)
configops="${configops} CONFIG_R8712_AP=y"
;;
+ RTL8192E)
+ configops="${configops} CONFIG_RTLLIB=m RTLLIB_CRYPTO_CCMP=m RTLLIB_CRYPTO_TKIP=m RTLLIB_CRYPTO_WEP=m "
+ ;;
SLICOSS)
# does not build on ppc and ppc64 as of 011109; tested with 2.6.30.9 and 2.6.31.5
( [[ "%{_target_cpu}" == "ppc" ]] || [[ "%{_target_cpu}" == "ppc64" ]] ) && continue
@@ -114,7 +117,7 @@
rm -rf ${RPM_BUILD_ROOT}
for kernel_version in %{?kernel_versions}; do
mkdir -p ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
- install -D -m 755 _kmod_build_${kernel_version%%___*}/drivers/staging/*/*.ko ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
+ install -D -m 755 -t ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ $(find _kmod_build_${kernel_version%%___*}/drivers/staging/ -name '*.ko')
done
# akmods hint:
# no akomds for now; packager is working on a solution where each driver will get its own akmod
@@ -127,20 +130,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
-* Sun Apr 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.6
-- rebuild for updated kernel
-
-* Sat Apr 14 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.5
-- rebuild for updated kernel
-
-* Thu Apr 12 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.4
-- rebuild for updated kernel
-
-* Tue Apr 03 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.3
-- rebuild for updated kernel
-
-* Fri Mar 30 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.2
-- rebuild for updated kernel
+* Mon Apr 30 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.3-2.1
+- make a few things more robust for drivers that have subdirectories (fixes
+ #2265)
+- enbable a few options r8192e driver needs since 3.3
* Wed Mar 21 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.3-1.1
- update to 3.3
11 years, 11 months
rpms/staging-kmod/devel staging-kmod.spec,1.24,1.25
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16377/devel
Modified Files:
staging-kmod.spec
Log Message:
* Mon Apr 30 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.3-2.1
- make a few things more robust for drivers that have subdirectories (fixes
#2265)
- enbable a few options r8192e driver needs since 3.3
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/devel/staging-kmod.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- staging-kmod.spec 4 Apr 2012 16:20:15 -0000 1.24
+++ staging-kmod.spec 30 Apr 2012 19:13:02 -0000 1.25
@@ -20,7 +20,7 @@
Name: staging-kmod
Version: 3.3
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.3
+Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}.1
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -50,7 +50,7 @@
%setup -q -c -T -a 0
# disable drivers that are enabled in Fedora's kernel, as those otherweise would get build
-sed -i 's|.*DABUSB.*||; s|.*SE401.*||; s|.*VICAM.*||; s|.CRYSTALH||; s|.*LIRC.*||;' linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/Makefile
+sed -i 's|.*DABUSB.*||; s|.*SE401.*||; s|.*VICAM.*||; s|.CRYSTALH||; s|.*LIRC.*||;' $(find linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/ -name 'Makefile')
# seperate directories for each kernel variant (PAE, non-PAE, ...) we build the modules for
for kernel_version in %{?kernel_versions} ; do
@@ -86,6 +86,9 @@
R8712U)
configops="${configops} CONFIG_R8712_AP=y"
;;
+ RTL8192E)
+ configops="${configops} CONFIG_RTLLIB=m RTLLIB_CRYPTO_CCMP=m RTLLIB_CRYPTO_TKIP=m RTLLIB_CRYPTO_WEP=m "
+ ;;
SLICOSS)
# does not build on ppc and ppc64 as of 011109; tested with 2.6.30.9 and 2.6.31.5
( [[ "%{_target_cpu}" == "ppc" ]] || [[ "%{_target_cpu}" == "ppc64" ]] ) && continue
@@ -114,7 +117,7 @@
rm -rf ${RPM_BUILD_ROOT}
for kernel_version in %{?kernel_versions}; do
mkdir -p ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
- install -D -m 755 _kmod_build_${kernel_version%%___*}/drivers/staging/*/*.ko ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
+ install -D -m 755 -t ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ $(find _kmod_build_${kernel_version%%___*}/drivers/staging/ -name '*.ko')
done
# akmods hint:
# no akomds for now; packager is working on a solution where each driver will get its own akmod
@@ -127,11 +130,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
-* Tue Apr 03 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.3
-- rebuild for updated kernel
-
-* Fri Mar 30 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.2
-- rebuild for updated kernel
+* Mon Apr 30 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.3-2.1
+- make a few things more robust for drivers that have subdirectories (fixes
+ #2265)
+- enbable a few options r8192e driver needs since 3.3
* Wed Mar 21 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.3-1.1
- update to 3.3
11 years, 11 months
rpms/staging-kmod/F-17 staging-kmod.spec,1.28,1.29
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15964
Modified Files:
staging-kmod.spec
Log Message:
* Mon Apr 30 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.3-2.1
- make a few things more robust for drivers that have subdirectories (fixes
#2265)
- enbable a few options r8192e driver needs since 3.3
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-17/staging-kmod.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- staging-kmod.spec 28 Apr 2012 22:50:30 -0000 1.28
+++ staging-kmod.spec 30 Apr 2012 19:03:52 -0000 1.29
@@ -20,7 +20,7 @@
Name: staging-kmod
Version: 3.3
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.7
+Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}.1
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -50,7 +50,7 @@
%setup -q -c -T -a 0
# disable drivers that are enabled in Fedora's kernel, as those otherweise would get build
-sed -i 's|.*DABUSB.*||; s|.*SE401.*||; s|.*VICAM.*||; s|.CRYSTALH||; s|.*LIRC.*||;' linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/Makefile
+sed -i 's|.*DABUSB.*||; s|.*SE401.*||; s|.*VICAM.*||; s|.CRYSTALH||; s|.*LIRC.*||;' $(find linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/ -name 'Makefile')
# seperate directories for each kernel variant (PAE, non-PAE, ...) we build the modules for
for kernel_version in %{?kernel_versions} ; do
@@ -86,6 +86,9 @@
R8712U)
configops="${configops} CONFIG_R8712_AP=y"
;;
+ RTL8192E)
+ configops="${configops} CONFIG_RTLLIB=m RTLLIB_CRYPTO_CCMP=m RTLLIB_CRYPTO_TKIP=m RTLLIB_CRYPTO_WEP=m "
+ ;;
SLICOSS)
# does not build on ppc and ppc64 as of 011109; tested with 2.6.30.9 and 2.6.31.5
( [[ "%{_target_cpu}" == "ppc" ]] || [[ "%{_target_cpu}" == "ppc64" ]] ) && continue
@@ -114,7 +117,7 @@
rm -rf ${RPM_BUILD_ROOT}
for kernel_version in %{?kernel_versions}; do
mkdir -p ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
- install -D -m 755 _kmod_build_${kernel_version%%___*}/drivers/staging/*/*.ko ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
+ install -D -m 755 -t ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ $(find _kmod_build_${kernel_version%%___*}/drivers/staging/ -name '*.ko')
done
# akmods hint:
# no akomds for now; packager is working on a solution where each driver will get its own akmod
@@ -127,23 +130,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
-* Sat Apr 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.7
-- rebuild for updated kernel
-
-* Sun Apr 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.6
-- rebuild for updated kernel
-
-* Mon Apr 16 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.5
-- rebuild for updated kernel
-
-* Thu Apr 12 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.4
-- rebuild for beta kernel
-
-* Tue Apr 03 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.3
-- rebuild for updated kernel
-
-* Fri Mar 30 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.2
-- rebuild for updated kernel
+* Mon Apr 30 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.3-2.1
+- make a few things more robust for drivers that have subdirectories (fixes
+ #2265)
+- enbable a few options r8192e driver needs since 3.3
* Wed Mar 21 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.3-1.1
- update to 3.3
11 years, 11 months
rpms/libmad/F-17 Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff, NONE, 1.1 libmad.thumb.diff, NONE, 1.1 libmad.spec, 1.8, 1.9
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libmad/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14750/F-17
Modified Files:
libmad.spec
Added Files:
Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff
libmad.thumb.diff
Log Message:
Add support for ARM
Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff:
fixed.h | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
--- NEW FILE Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff ---
diff --git a/fixed.h b/fixed.h
index 4b58abf..ba4bc26 100644
--- a/fixed.h
+++ b/fixed.h
@@ -275,12 +275,25 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
: "+r" (lo), "+r" (hi) \
: "%r" (x), "r" (y))
+#ifdef __thumb__
+/* In Thumb-2, the RSB-immediate instruction is only allowed with a zero
+ operand. If needed this code can also support Thumb-1
+ (simply append "s" to the end of the second two instructions). */
+# define MAD_F_MLN(hi, lo) \
+ asm ("rsbs %0, %2, #0\n\t" \
+ "sbc %1, %1, %1\n\t" \
+ "sub %1, %1, %3\n\t" \
+ : "=&r" (lo), "=&r" (hi) \
+ : "0" (lo), "1" (hi) \
+ : "cc")
+#else /* ! __thumb__ */
# define MAD_F_MLN(hi, lo) \
asm ("rsbs %0, %2, #0\n\t" \
"rsc %1, %3, #0" \
- : "=r" (lo), "=r" (hi) \
+ : "=&r" (lo), "=r" (hi) \
: "0" (lo), "1" (hi) \
: "cc")
+#endif /* __thumb__ */
# define mad_f_scale64(hi, lo) \
({ mad_fixed_t __result; \
libmad.thumb.diff:
imdct_l_arm.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE libmad.thumb.diff ---
--- ./imdct_l_arm.S.orig 2010-02-25 13:25:23.000000000 +0100
+++ ./imdct_l_arm.S 2010-02-25 13:27:26.000000000 +0100
@@ -468,7 +468,7 @@
@----
- add r2, pc, #(imdct36_long_karray-.-8) @ r2 = base address of Knn array (PIC safe ?)
+ adr r2, imdct36_long_karray
loop:
Index: libmad.spec
===================================================================
RCS file: /cvs/free/rpms/libmad/F-17/libmad.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libmad.spec 25 Jan 2012 14:50:28 -0000 1.8
+++ libmad.spec 30 Apr 2012 18:28:32 -0000 1.9
@@ -1,6 +1,6 @@
Name: libmad
Version: 0.15.1b
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: MPEG audio decoder library
Group: System Environment/Libraries
@@ -9,6 +9,10 @@
Source0: http://download.sourceforge.net/mad/%{name}-%{version}.tar.gz
Patch0: libmad-0.15.1b-multiarch.patch
Patch1: libmad-0.15.1b-ppc.patch
+#https://bugs.launchpad.net/ubuntu/+source/libmad/+bug/534287
+Patch2: Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff
+#https://bugs.launchpad.net/ubuntu/+source/libmad/+bug/513734
+Patch3: libmad.thumb.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: automake
@@ -34,8 +38,12 @@
%prep
%setup -q
+%ifarch %{ix86} x86_64 ppc ppc64
%patch0 -p1 -b .multiarch
+%endif
%patch1 -p1 -b .ppc
+%patch2 -p1 -b .alt_t2
+%patch3 -p1 -b .thumb
sed -i -e /-fforce-mem/d configure* # -fforce-mem gone in gcc 4.2, noop earlier
touch -r aclocal.m4 configure.ac NEWS AUTHORS ChangeLog
@@ -60,9 +68,12 @@
%build
autoreconf -sfi
%configure \
-%ifarch x86_64 ia64 ppc64
+%if %{__isa_bits} == 64
--enable-fpm=64bit \
%endif
+%ifarch %{arm}
+ --enable-fpm=arm \
+%endif
--disable-dependency-tracking \
--enable-accuracy \
--disable-debugging \
@@ -99,6 +110,11 @@
%changelog
+* Sat Apr 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.15.1b-15
+- Don't use multiarch patch when the result is not hardcoded
+- Update FPM
+- Add patches from lp#534287 and lp#534287
+
* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.15.1b-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
11 years, 11 months
rpms/libmad/devel Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff, NONE, 1.1 libmad.thumb.diff, NONE, 1.1 libmad.spec, 1.8, 1.9
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libmad/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13925/devel
Modified Files:
libmad.spec
Added Files:
Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff
libmad.thumb.diff
Log Message:
Add support for ARM
Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff:
fixed.h | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
--- NEW FILE Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff ---
diff --git a/fixed.h b/fixed.h
index 4b58abf..ba4bc26 100644
--- a/fixed.h
+++ b/fixed.h
@@ -275,12 +275,25 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
: "+r" (lo), "+r" (hi) \
: "%r" (x), "r" (y))
+#ifdef __thumb__
+/* In Thumb-2, the RSB-immediate instruction is only allowed with a zero
+ operand. If needed this code can also support Thumb-1
+ (simply append "s" to the end of the second two instructions). */
+# define MAD_F_MLN(hi, lo) \
+ asm ("rsbs %0, %2, #0\n\t" \
+ "sbc %1, %1, %1\n\t" \
+ "sub %1, %1, %3\n\t" \
+ : "=&r" (lo), "=&r" (hi) \
+ : "0" (lo), "1" (hi) \
+ : "cc")
+#else /* ! __thumb__ */
# define MAD_F_MLN(hi, lo) \
asm ("rsbs %0, %2, #0\n\t" \
"rsc %1, %3, #0" \
- : "=r" (lo), "=r" (hi) \
+ : "=&r" (lo), "=r" (hi) \
: "0" (lo), "1" (hi) \
: "cc")
+#endif /* __thumb__ */
# define mad_f_scale64(hi, lo) \
({ mad_fixed_t __result; \
libmad.thumb.diff:
imdct_l_arm.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE libmad.thumb.diff ---
--- ./imdct_l_arm.S.orig 2010-02-25 13:25:23.000000000 +0100
+++ ./imdct_l_arm.S 2010-02-25 13:27:26.000000000 +0100
@@ -468,7 +468,7 @@
@----
- add r2, pc, #(imdct36_long_karray-.-8) @ r2 = base address of Knn array (PIC safe ?)
+ adr r2, imdct36_long_karray
loop:
Index: libmad.spec
===================================================================
RCS file: /cvs/free/rpms/libmad/devel/libmad.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libmad.spec 25 Jan 2012 14:50:28 -0000 1.8
+++ libmad.spec 30 Apr 2012 18:27:50 -0000 1.9
@@ -1,6 +1,6 @@
Name: libmad
Version: 0.15.1b
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: MPEG audio decoder library
Group: System Environment/Libraries
@@ -9,6 +9,10 @@
Source0: http://download.sourceforge.net/mad/%{name}-%{version}.tar.gz
Patch0: libmad-0.15.1b-multiarch.patch
Patch1: libmad-0.15.1b-ppc.patch
+#https://bugs.launchpad.net/ubuntu/+source/libmad/+bug/534287
+Patch2: Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff
+#https://bugs.launchpad.net/ubuntu/+source/libmad/+bug/513734
+Patch3: libmad.thumb.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: automake
@@ -34,8 +38,12 @@
%prep
%setup -q
+%ifarch %{ix86} x86_64 ppc ppc64
%patch0 -p1 -b .multiarch
+%endif
%patch1 -p1 -b .ppc
+%patch2 -p1 -b .alt_t2
+%patch3 -p1 -b .thumb
sed -i -e /-fforce-mem/d configure* # -fforce-mem gone in gcc 4.2, noop earlier
touch -r aclocal.m4 configure.ac NEWS AUTHORS ChangeLog
@@ -60,9 +68,12 @@
%build
autoreconf -sfi
%configure \
-%ifarch x86_64 ia64 ppc64
+%if %{__isa_bits} == 64
--enable-fpm=64bit \
%endif
+%ifarch %{arm}
+ --enable-fpm=arm \
+%endif
--disable-dependency-tracking \
--enable-accuracy \
--disable-debugging \
@@ -99,6 +110,11 @@
%changelog
+* Sat Apr 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.15.1b-15
+- Don't use multiarch patch when the result is not hardcoded
+- Update FPM
+- Add patches from lp#534287 and lp#534287
+
* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.15.1b-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
11 years, 11 months
rpms/fceux/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/fceux/devel
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/free/owners/tmpcvsB12867/rpms/fceux/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module fceux
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: fceux
# $Id: Makefile,v 1.1 2012/04/30 17:44:30 kwizart Exp $
NAME := fceux
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
11 years, 11 months
rpms/fceux Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/fceux
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/free/owners/tmpcvsB12867/rpms/fceux
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module fceux
--- NEW FILE Makefile ---
# Top level Makefile for module fceux
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
11 years, 11 months
rpms/fceux/devel - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/fceux/devel
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/free/owners/tmpcvsB12867/rpms/fceux/devel
Log Message:
Directory /cvs/free/rpms/fceux/devel added to the repository
11 years, 11 months
rpms/fceux - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/fceux
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/free/owners/tmpcvsB12867/rpms/fceux
Log Message:
Directory /cvs/free/rpms/fceux added to the repository
11 years, 11 months