[x264/f25] (6 commits) ...rework asm treatment on i686 and ppc64
by Dominik Mierzejewski
Summary of changes:
99c333a... Revert "Update x264 to 0.148-20160412-fd2c324" (*)
ab1a9f4... Update sources (*)
ffe4b8a... Revert "Update sources" (*)
ac69c20... Revert "Revert "Update x264 to 0.148-20160412-fd2c324"" (*)
db25abd... Merge branch 'f23' (*)
2448535... rework asm treatment on i686 and ppc64 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 8 months
[x264] rework asm treatment on i686 and ppc64
by Dominik Mierzejewski
commit 24485358687e458200b9512625c5dc33131dc410
Author: Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net>
Date: Sun Aug 28 00:38:52 2016 +0200
rework asm treatment on i686 and ppc64
- fix adding the 10b suffix to the library name
- correct the list of ASM-enabled arches:
* ppc64 can be Power5, which doesn't have AltiVec
* ppc64le always has it
* no implementation for sparc
- force non-executable stack on armv7 (#3975)
- explicitly disable OpenCL support, it's dlopened at the moment
and not working without ocl-icd-devel
- drop doc and license from main package, libs already contain it
- update URL
x264-10b.patch | 37 ++++++++++++++++++
x264.spec | 116 ++++++++++++++++++++++++++++++++++++++-------------------
2 files changed, 114 insertions(+), 39 deletions(-)
---
diff --git a/x264-10b.patch b/x264-10b.patch
new file mode 100644
index 0000000..6c58b9f
--- /dev/null
+++ b/x264-10b.patch
@@ -0,0 +1,37 @@
+diff -up generic10/configure.10b generic10/configure
+--- generic10/configure.10b 2016-08-26 19:48:41.447839506 +0200
++++ generic10/configure 2016-08-26 19:49:26.902033893 +0200
+@@ -1372,6 +1374,12 @@ PROF_USE_LD=$PROF_USE_LD
+ HAVE_OPENCL=$opencl
+ EOF
+
++if [ "$bit_depth" -gt "8" ]; then
++ echo "LIBNAME=libx264${bit_depth}b" >> config.mak
++else
++ echo "LIBNAME=libx264" >> config.mak
++fi
++
+ if [ $compiler_style = MS ]; then
+ echo '%.o: %.c' >> config.mak
+ echo ' $(CC) $(CFLAGS) -c -Fo$@ $<' >> config.mak
+@@ -1410,7 +1418,7 @@ if [ "$shared" = "yes" ]; then
+ echo "SOFLAGS=-shared -Wl,-h,\$(SONAME) $SOFLAGS" >> config.mak
+ else
+ echo "SOSUFFIX=so" >> config.mak
+- echo "SONAME=libx264.so.$API" >> config.mak
++ echo "SONAME=\$(LIBNAME).so.$API" >> config.mak
+ echo "SOFLAGS=-shared -Wl,-soname,\$(SONAME) $SOFLAGS" >> config.mak
+ fi
+ echo 'default: lib-shared' >> config.mak
+diff -up generic10/Makefile.10b generic10/Makefile
+--- generic10/Makefile.10b 2016-06-14 14:04:37.000000000 +0200
++++ generic10/Makefile 2016-08-26 19:48:41.449839514 +0200
+@@ -302,7 +302,7 @@ ifneq ($(IMPLIBNAME),)
+ $(INSTALL) -m 755 $(SONAME) $(DESTDIR)$(bindir)
+ $(INSTALL) -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir)
+ else ifneq ($(SONAME),)
+- ln -f -s $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX)
++ ln -f -s $(SONAME) $(DESTDIR)$(libdir)/$(LIBNAME).$(SOSUFFIX)
+ $(INSTALL) -m 755 $(SONAME) $(DESTDIR)$(libdir)
+ endif
+
diff --git a/x264.spec b/x264.spec
index 25a44f4..3f60dfa 100644
--- a/x264.spec
+++ b/x264.spec
@@ -14,31 +14,42 @@
%global _without_libswscale 1
}
#Whitelist of arches with dedicated ASM code
-#i686 is disabled on purpose - re-enabled with sse2 build
-%ifnarch x86_64 armv7hl armv7hnl ppc ppc64 %{sparc} aarch64
+%global asmarch x86_64 armv7hl armv7hnl ppc64le aarch64
+# list of arches where ASM must be optional
+%global simdarch i686 ppc64
+%ifnarch %{asmarch}
%global _without_asm 1
%endif
+%ifarch i686
+%global slibdir %{_libdir}/sse2
+%endif
+%ifarch ppc64
+%global slibdir %{_libdir}/altivec
+%endif
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
-Release: 10%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 11%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
-URL: http://developers.videolan.org/x264.html
+URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
Source1: x264-snapshot.sh
-BuildRequires: perl-Digest-MD5
# don't remove config.h and don't re-run version.sh
Patch0: x264-nover.patch
+# add 10b suffix to high bit depth build
+Patch1: x264-10b.patch
Patch10: x264-gpac.patch
%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel libjpeg-devel}
%{!?_without_libavformat:BuildRequires: ffmpeg-devel}
%{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel}
-%{!?_without_asm:BuildRequires: yasm >= 1.0.0}
-# for sse2 build
-%ifarch i686
+# https://bugzilla.rpmfusion.org/show_bug.cgi?id=3975
+%ifarch armv7hl armv7hnl
+BuildRequires: execstack
+%endif
+%ifarch %{asmarch} %{simdarch}
BuildRequires: yasm >= 1.0.0
%endif
# we need to enforce the exact EVR for an ISA - not only the same ABI
@@ -73,6 +84,7 @@ This package contains the development files.
%{?_without_libavformat:--disable-lavf} \\\
%{?_without_libswscale:--disable-swscale} \\\
%{!?_with_ffmpegsource:--disable-ffms} \\\
+ --disable-opencl \\\
--enable-debug \\\
--enable-shared \\\
--system-libx264 \\\
@@ -82,12 +94,13 @@ This package contains the development files.
%setup -q -c -n %{name}-0.%{api}-%{snapshot}
pushd %{name}-0.%{api}-%{snapshot}
%patch0 -p1 -b .nover
+%patch1 -p1 -b .10b
%patch10 -p1 -b .gpac
popd
variants="generic generic10"
-%ifarch i686
-variants="$variants simd"
+%ifarch %{simdarch}
+variants="$variants simd simd10"
%endif
for variant in $variants ; do
rm -rf ${variant}
@@ -103,78 +116,103 @@ pushd generic
%{__make} %{?_smp_mflags}
popd
-%ifarch i686
+pushd generic10
+%{x_configure}\
+ %{?_without_asm:--disable-asm}\
+ --disable-cli\
+ --bit-depth=10
+
+%{__make} %{?_smp_mflags}
+popd
+
+%ifarch %{simdarch}
pushd simd
%{x_configure}\
- --libdir=%{_libdir}/sse2
+ --libdir=%{slibdir}
%{__make} %{?_smp_mflags}
popd
-%endif
-pushd generic10
+pushd simd10
%{x_configure}\
-%ifnarch i686
- %{?_without_asm:--disable-asm}\
-%endif
+ --disable-cli\
+ --libdir=%{slibdir}\
--bit-depth=10
-sed -i -e "s/SONAME=libx264.so./SONAME=libx26410b.so./" config.mak
-
%{__make} %{?_smp_mflags}
popd
+%endif
%install
-pushd generic
+for variant in generic generic10 ; do
+pushd ${variant}
%make_install
popd
-%ifarch i686
-pushd simd
+done
+%ifarch %{simdarch}
+for variant in simd simd10 ; do
+pushd ${variant}
%make_install
-rm %{buildroot}%{_libdir}/*/pkgconfig/x264.pc
+rm %{buildroot}%{slibdir}/pkgconfig/x264.pc
popd
+done
%endif
-pushd generic10
-SONAME=`grep "^SONAME=" config.mak`
-export $SONAME
-install -m 755 ${SONAME} %{buildroot}%{_libdir}
-ln -fs ${SONAME} %{buildroot}%{_libdir}/libx26410b.so
-popd
#Fix timestamp on x264 generated headers
touch -r generic/version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_includedir}/x264_config.h
+# https://bugzilla.rpmfusion.org/show_bug.cgi?id=3975
+%ifarch armv7hl armv7hnl
+execstack -c %{buildroot}%{_libdir}/libx264{,10b}.so.%{api}
+%endif
+
+install -dm755 %{buildroot}%{_pkgdocdir}
+install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files
-%doc generic/AUTHORS
-%license generic/COPYING
%{_bindir}/x264
%files libs
-%doc generic/AUTHORS
-%license generic/COPYING
+%dir %{_pkgdocdir}
+%{_pkgdocdir}/AUTHORS
+%license %{_pkgdocdir}/COPYING
%{_libdir}/libx264.so.%{api}
-%ifarch i686
-%{_libdir}/sse2/libx264.so.%{api}
-%endif
%{_libdir}/libx26410b.so.%{api}
+%ifarch %{simdarch}
+%{slibdir}/libx264.so.%{api}
+%{slibdir}/libx26410b.so.%{api}
+%endif
%files devel
%doc generic/doc/*
%{_includedir}/x264.h
%{_includedir}/x264_config.h
%{_libdir}/libx264.so
+%{_libdir}/libx26410b.so
%{_libdir}/pkgconfig/%{name}.pc
-%ifarch i686
-%{_libdir}/sse2/libx264.so
+%ifarch %{simdarch}
+%{slibdir}/libx264.so
+%{slibdir}/libx26410b.so
%endif
-%{_libdir}/libx26410b.so
%changelog
+* Fri Aug 26 2016 Dominik Mierzejewski <rpm(a)greysector.net> - 0.148-11.20160614gita5e06b9
+- rework asm treatment on i686 and ppc64
+- fix adding the 10b suffix to the library name
+- correct the list of ASM-enabled arches:
+ * ppc64 can be Power5, which doesn't have AltiVec
+ * ppc64le always has it
+ * no implementation for sparc
+- force non-executable stack on armv7 (#3975)
+- explicitly disable OpenCL support, it's dlopened at the moment
+ and not working without ocl-icd-devel
+- drop doc and license from main package, libs already contain it
+- update URL
+
* Thu Aug 18 2016 Sérgio Basto <sergio(a)serjux.com> - 0.148-10.20160614gita5e06b9
- Add license tag also to x264-libs
7 years, 8 months
[lives/f23] Update to 2.6.8
by Antonio
Summary of changes:
7695de5... Update to 2.6.8 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 8 months
[lives/f24] Update to 2.6.8
by Antonio
Summary of changes:
7695de5... Update to 2.6.8 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 8 months
[lives/f25] Update to 2.6.8
by Antonio
Summary of changes:
7695de5... Update to 2.6.8 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 8 months
[lives] Update to 2.6.8
by Antonio
commit 7695de584d4bb0017d2b49e48ebc17b4d72d6ada
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sat Aug 27 20:45:13 2016 +0200
Update to 2.6.8
.gitignore | 1 +
lives.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 114caf4..4c30fe8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/LiVES-2.6.5.tar.bz2
/LiVES-2.6.6.tar.bz2
/LiVES-2.6.7.tar.bz2
+/LiVES-2.6.8.tar.bz2
diff --git a/lives.spec b/lives.spec
index d274321..88749b6 100644
--- a/lives.spec
+++ b/lives.spec
@@ -12,7 +12,7 @@
#
Name: lives
-Version: 2.6.7
+Version: 2.6.8
Release: 1%{?dist}
Summary: Video editor and VJ tool
License: GPLv3+ and LGPLv3+
@@ -187,6 +187,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.
%{_datadir}/appdata/LiVES.appdata.xml
%changelog
+* Sat Aug 27 2016 Antonio Trande <sagitterATfedoraproject.org> - 2.6.8-1
+- Update to 2.6.8
+
* Fri Aug 19 2016 Antonio Trande <sagitterATfedoraproject.org> - 2.6.7-1
- Update to 2.6.7
diff --git a/sources b/sources
index 9893245..9a8ee9f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c8e762325d1bd70eafa33b7dfcf2de7b LiVES-2.6.7.tar.bz2
+1b0fe11fc1c20fb176e740f181a948ad LiVES-2.6.8.tar.bz2
7 years, 8 months
[ffmpeg/f25] Updated to 3.1.3
by Julian Sikorski
Summary of changes:
c4df855... Updated to 3.1.3 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 8 months
[ffmpeg] Updated to 3.1.3
by Julian Sikorski
commit c4df8558696631cffb372a39418da3fe54b04bd7
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Sat Aug 27 08:43:35 2016 +0200
Updated to 3.1.3
.gitignore | 1 +
ffmpeg.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ce82481..e429dda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
ffmpeg-2.8.7.tar.xz
/ffmpeg-3.1.1.tar.xz
/ffmpeg-3.1.2.tar.xz
+/ffmpeg-3.1.3.tar.xz
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 2ced801..33cc6a4 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -13,8 +13,8 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 3.1.2
-Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
+Version: 3.1.3
+Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr} || 0%{?_with_gmp}
License: GPLv3+
%else
@@ -325,6 +325,9 @@ install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
%changelog
+* Sat Aug 27 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.1.3-1
+- Updated to 3.1.3
+
* Thu Aug 25 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.1.2-2
- enable support for nvenc
diff --git a/sources b/sources
index 5dc8ec8..fe6fcde 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf030109b066a336fc4f7d3a123abf66 ffmpeg-3.1.2.tar.xz
+72769316a4b2b8809c7f6d5a8b6766f4 ffmpeg-3.1.3.tar.xz
7 years, 8 months
[kodi] Update to 17.0 beta 1
by Michael Cronenworth
Summary of changes:
03aae55... Update to 17.0 beta 1 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 8 months
[kodi/f25] Update to 17.0 beta 1
by Michael Cronenworth
commit 03aae55b3299175cb7877210fae29ad1b01ab5f1
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Fri Aug 26 18:43:20 2016 -0500
Update to 17.0 beta 1
.gitignore | 2 +-
kodi-generate-tarball-xz.sh | 2 +-
kodi.spec | 7 +++++--
sources | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1464341..a4e7fa3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kodi-17.0a3-patched.tar.xz
+/kodi-17.0b1-patched.tar.xz
diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh
index bd7081d..cbbf6a3 100755
--- a/kodi-generate-tarball-xz.sh
+++ b/kodi-generate-tarball-xz.sh
@@ -1,7 +1,7 @@
#!/bin/sh
MAJORVERSION=17
-MINORVERSION=0a3
+MINORVERSION=0b1
#GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96
#GITSHORT=ge988513
CODENAME=Krypton
diff --git a/kodi.spec b/kodi.spec
index ad37bab..bf2b2d8 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -1,4 +1,4 @@
-%global PRERELEASE a3
+%global PRERELEASE b1
%global DIRVERSION %{version}
#global GITCOMMIT Gotham_r2-ge988513
# use the line below for pre-releases
@@ -8,7 +8,7 @@
Name: kodi
Version: 17.0
-Release: 0.4%{?dist}
+Release: 0.5%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -400,6 +400,9 @@ fi
%changelog
+* Fri Aug 26 2016 Michael Cronenworth <mike(a)cchtml.com> - 17.0-0.5
+- Kodi 17 beta 1
+
* Fri Aug 05 2016 Michael Cronenworth <mike(a)cchtml.com> - 17.0-0.4
- Kodi 17 alpha 3
diff --git a/sources b/sources
index 0dd69a7..0485efc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-82d6c0b4945c0298635d9ab9fa085a2f kodi-17.0a3-patched.tar.xz
+d7ab68c604fb8214dd4b3f68af4e217d kodi-17.0b1-patched.tar.xz
7 years, 8 months