[x264/el8: 7/7] Merge branch 'f29' into el8
by Dominik Mierzejewski
commit cfce515653badb2061d7dbb5177a853087521619
Merge: c8b97a7 c696e2a
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Fri Oct 4 10:04:33 2019 +0200
Merge branch 'f29' into el8
x264.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --cc x264.spec
index 986f39e,bbeaabc..a66337c
--- a/x264.spec
+++ b/x264.spec
@@@ -31,7 -31,7 +31,7 @@@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
- Release: 11%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
-Release: 6%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
++Release: 12%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@@ -207,25 -209,13 +207,28 @@@ install -pm644 generic/{AUTHORS,COPYING
%endif
%changelog
-* Fri Oct 04 2019 Dominik Mierzejewski <rpm(a)greysector.net> - 0.155-6.20180806git0a84d98
++* Fri Oct 04 2019 Dominik Mierzejewski <rpm(a)greysector.net> - 0.157-12.20190717git34c06d1
+ - don't overwrite generic headers with 10bit on simdarch (rfbz#5071)
+
-* Tue May 07 2019 Sérgio Basto <sergio(a)serjux.com> - 0.155-5.20180806git0a84d98
+* Mon Aug 26 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 0.157-11.20190717git34c06d1
+- Drop hack for arm builders
+
+* Tue Aug 06 2019 Leigh Scott <leigh123linux(a)gmail.com> - 0.157-10.20190717git34c06d1
+- Rebuild for new ffmpeg version
+
+* Wed Jul 17 2019 Sérgio Basto <sergio(a)serjux.com> - 0.157-9.20190717git34c06d1
+- 0.157 update, date 2019-07-17 (stable branch)
+
+* Tue May 07 2019 Sérgio Basto <sergio(a)serjux.com> - 0.157-8.20190303git72db437
- Revert "Build /usr/bin/x264 with gpac shared lib instead static lib."
-* Mon May 06 2019 Sérgio Basto <sergio(a)serjux.com> - 0.155-4.20180806git0a84d98
+* Wed May 01 2019 Leigh Scott <leigh123linux(a)gmail.com> - 0.157-7.20190303git72db437
+- Fix ARM rpm mangle issue
+
+* Tue Apr 30 2019 Sérgio Basto <sergio(a)serjux.com> - 0.157-6.20190303git72db437_bootstrap
+- Bootstrap to fix arm builds
+
+* Mon Apr 29 2019 Sérgio Basto <sergio(a)serjux.com> - 0.157-5.20190303git72db437
- Enable opencl (which is default) only exist --disable-opencl option
- Disable opencl on 10bit seems that is just prepared for 8bit.
- Build /usr/bin/x264 with gpac shared lib instead static lib.
4 years, 6 months
[x264/el8] (7 commits) ...Merge branch 'f29' into el8
by Dominik Mierzejewski
Summary of changes:
4a04df0... Fix opencl dlopen (rfbz#5185) (*)
fda3c03... Enable opencl (which is default) only exist --disable-openc (*)
808c02f... Build /usr/bin/x264 with gpac shared lib instead static lib (*)
a5fc59d... Revert "Build /usr/bin/x264 with gpac shared lib instead st (*)
7e32722... don't overwrite generic headers with 10bit on simdarch (rfb (*)
c696e2a... whitespace cosmetics: replace tabs with spaces (*)
cfce515... Merge branch 'f29' into el8
(*) This commit already existed in another branch; no separate mail sent
4 years, 6 months
[x264/f30: 7/7] Merge branch 'f29' into f30
by Dominik Mierzejewski
commit ddf980a56bf490cc082cd2059bf52747f339276e
Merge: c8b97a7 c696e2a
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Fri Oct 4 10:00:13 2019 +0200
Merge branch 'f29' into f30
x264.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --cc x264.spec
index 986f39e,bbeaabc..a66337c
--- a/x264.spec
+++ b/x264.spec
@@@ -31,7 -31,7 +31,7 @@@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
- Release: 11%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
-Release: 6%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
++Release: 12%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@@ -207,25 -209,13 +207,28 @@@ install -pm644 generic/{AUTHORS,COPYING
%endif
%changelog
-* Fri Oct 04 2019 Dominik Mierzejewski <rpm(a)greysector.net> - 0.155-6.20180806git0a84d98
++* Fri Oct 04 2019 Dominik Mierzejewski <rpm(a)greysector.net> - 0.157-12.20190717git34c06d1
+ - don't overwrite generic headers with 10bit on simdarch (rfbz#5071)
+
-* Tue May 07 2019 Sérgio Basto <sergio(a)serjux.com> - 0.155-5.20180806git0a84d98
+* Mon Aug 26 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 0.157-11.20190717git34c06d1
+- Drop hack for arm builders
+
+* Tue Aug 06 2019 Leigh Scott <leigh123linux(a)gmail.com> - 0.157-10.20190717git34c06d1
+- Rebuild for new ffmpeg version
+
+* Wed Jul 17 2019 Sérgio Basto <sergio(a)serjux.com> - 0.157-9.20190717git34c06d1
+- 0.157 update, date 2019-07-17 (stable branch)
+
+* Tue May 07 2019 Sérgio Basto <sergio(a)serjux.com> - 0.157-8.20190303git72db437
- Revert "Build /usr/bin/x264 with gpac shared lib instead static lib."
-* Mon May 06 2019 Sérgio Basto <sergio(a)serjux.com> - 0.155-4.20180806git0a84d98
+* Wed May 01 2019 Leigh Scott <leigh123linux(a)gmail.com> - 0.157-7.20190303git72db437
+- Fix ARM rpm mangle issue
+
+* Tue Apr 30 2019 Sérgio Basto <sergio(a)serjux.com> - 0.157-6.20190303git72db437_bootstrap
+- Bootstrap to fix arm builds
+
+* Mon Apr 29 2019 Sérgio Basto <sergio(a)serjux.com> - 0.157-5.20190303git72db437
- Enable opencl (which is default) only exist --disable-opencl option
- Disable opencl on 10bit seems that is just prepared for 8bit.
- Build /usr/bin/x264 with gpac shared lib instead static lib.
4 years, 6 months
[x264] (7 commits) ...Merge branch 'f29' into f30
by Dominik Mierzejewski
Summary of changes:
4a04df0... Fix opencl dlopen (rfbz#5185) (*)
fda3c03... Enable opencl (which is default) only exist --disable-openc (*)
808c02f... Build /usr/bin/x264 with gpac shared lib instead static lib (*)
a5fc59d... Revert "Build /usr/bin/x264 with gpac shared lib instead st (*)
7e32722... don't overwrite generic headers with 10bit on simdarch (rfb (*)
c696e2a... whitespace cosmetics: replace tabs with spaces (*)
ddf980a... Merge branch 'f29' into f30 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 6 months
[x264/f29] whitespace cosmetics: replace tabs with spaces
by Dominik Mierzejewski
commit c696e2a46b7ed99fae5f8fcc93373b06034c5447
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Fri Oct 4 09:57:23 2019 +0200
whitespace cosmetics: replace tabs with spaces
x264.spec | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/x264.spec b/x264.spec
index 5d42b93..bbeaabc 100644
--- a/x264.spec
+++ b/x264.spec
@@ -86,13 +86,13 @@ This package contains the development files.
%global x_configure \
%configure \\\
- %{?_without_libavformat:--disable-lavf} \\\
- %{?_without_libswscale:--disable-swscale} \\\
- %{!?_with_ffmpegsource:--disable-ffms} \\\
- --enable-debug \\\
- --enable-shared \\\
- --system-libx264 \\\
- --enable-pic
+ %{?_without_libavformat:--disable-lavf} \\\
+ %{?_without_libswscale:--disable-swscale} \\\
+ %{!?_with_ffmpegsource:--disable-ffms} \\\
+ --enable-debug \\\
+ --enable-shared \\\
+ --system-libx264 \\\
+ --enable-pic
%prep
%setup -q -c -n %{name}-0.%{api}-%{snapshot}
@@ -117,17 +117,17 @@ done
%build
pushd generic
%{x_configure}\
- %{?_without_asm:--disable-asm}
+ %{?_without_asm:--disable-asm}
%{__make} %{?_smp_mflags}
popd
pushd generic10
%{x_configure}\
- %{?_without_asm:--disable-asm}\
- --disable-cli\
+ %{?_without_asm:--disable-asm}\
+ --disable-cli\
--disable-opencl \
- --bit-depth=10
+ --bit-depth=10
%{__make} %{?_smp_mflags}
popd
@@ -135,17 +135,17 @@ popd
%ifarch %{simdarch}
pushd simd
%{x_configure}\
- --libdir=%{slibdir}
+ --libdir=%{slibdir}
%{__make} %{?_smp_mflags}
popd
pushd simd10
%{x_configure}\
- --disable-cli\
- --libdir=%{slibdir}\
+ --disable-cli\
+ --libdir=%{slibdir}\
--disable-opencl \
- --bit-depth=10
+ --bit-depth=10
%{__make} %{?_smp_mflags}
popd
4 years, 6 months
[x264/f31] (7 commits) ...Merge branch 'f29' into f30
by Dominik Mierzejewski
Summary of changes:
4a04df0... Fix opencl dlopen (rfbz#5185) (*)
fda3c03... Enable opencl (which is default) only exist --disable-openc (*)
808c02f... Build /usr/bin/x264 with gpac shared lib instead static lib (*)
a5fc59d... Revert "Build /usr/bin/x264 with gpac shared lib instead st (*)
7e32722... don't overwrite generic headers with 10bit on simdarch (rfb (*)
c696e2a... whitespace cosmetics: replace tabs with spaces (*)
ddf980a... Merge branch 'f29' into f30 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 6 months
[x264/f30] (7 commits) ...Merge branch 'f29' into f30
by Dominik Mierzejewski
Summary of changes:
4a04df0... Fix opencl dlopen (rfbz#5185) (*)
fda3c03... Enable opencl (which is default) only exist --disable-openc (*)
808c02f... Build /usr/bin/x264 with gpac shared lib instead static lib (*)
a5fc59d... Revert "Build /usr/bin/x264 with gpac shared lib instead st (*)
7e32722... don't overwrite generic headers with 10bit on simdarch (rfb (*)
c696e2a... whitespace cosmetics: replace tabs with spaces (*)
ddf980a... Merge branch 'f29' into f30
(*) This commit already existed in another branch; no separate mail sent
4 years, 6 months
[x264/f29] don't overwrite generic headers with 10bit on simdarch (rfbz#5071)
by Dominik Mierzejewski
commit 7e32722fab8410d62c2cf5fbcbb1800237c874f5
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Fri Oct 4 09:54:00 2019 +0200
don't overwrite generic headers with 10bit on simdarch (rfbz#5071)
x264.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/x264.spec b/x264.spec
index a7175ea..5d42b93 100644
--- a/x264.spec
+++ b/x264.spec
@@ -31,7 +31,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
-Release: 5%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 6%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -159,7 +159,7 @@ pushd ${variant}
popd
done
%ifarch %{simdarch}
-for variant in simd simd10 ; do
+for variant in simd10 simd ; do
pushd ${variant}
%make_install
rm %{buildroot}%{slibdir}/pkgconfig/x264.pc
@@ -209,6 +209,9 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%endif
%changelog
+* Fri Oct 04 2019 Dominik Mierzejewski <rpm(a)greysector.net> - 0.155-6.20180806git0a84d98
+- don't overwrite generic headers with 10bit on simdarch (rfbz#5071)
+
* Tue May 07 2019 Sérgio Basto <sergio(a)serjux.com> - 0.155-5.20180806git0a84d98
- Revert "Build /usr/bin/x264 with gpac shared lib instead static lib."
4 years, 6 months
[x264/el7] whitespace cosmetics: replace tabs with spaces
by Dominik Mierzejewski
commit 5950a7e1f9ab7bf3b9696616a17eb912aa924c80
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Fri Oct 4 09:57:23 2019 +0200
whitespace cosmetics: replace tabs with spaces
x264.spec | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/x264.spec b/x264.spec
index ed45c63..500c0ec 100644
--- a/x264.spec
+++ b/x264.spec
@@ -84,14 +84,14 @@ This package contains the development files.
%global x_configure \
%configure \\\
- %{?_without_libavformat:--disable-lavf} \\\
- %{?_without_libswscale:--disable-swscale} \\\
- %{!?_with_ffmpegsource:--disable-ffms} \\\
- --disable-opencl \\\
- --disable-debug \\\
- --enable-shared \\\
- --system-libx264 \\\
- --enable-pic
+ %{?_without_libavformat:--disable-lavf} \\\
+ %{?_without_libswscale:--disable-swscale} \\\
+ %{!?_with_ffmpegsource:--disable-ffms} \\\
+ --disable-opencl \\\
+ --disable-debug \\\
+ --enable-shared \\\
+ --system-libx264 \\\
+ --enable-pic
%prep
%setup -q -c -n %{name}-0.%{api}-%{snapshot}
@@ -114,16 +114,16 @@ done
%build
pushd generic
%{x_configure}\
- %{?_without_asm:--disable-asm}
+ %{?_without_asm:--disable-asm}
%make_build
popd
pushd generic10
%{x_configure}\
- %{?_without_asm:--disable-asm}\
- --disable-cli\
- --bit-depth=10
+ %{?_without_asm:--disable-asm}\
+ --disable-cli\
+ --bit-depth=10
%make_build
popd
@@ -131,16 +131,16 @@ popd
%ifarch %{simdarch}
pushd simd
%{x_configure}\
- --libdir=%{slibdir}
+ --libdir=%{slibdir}
%make_build
popd
pushd simd10
%{x_configure}\
- --disable-cli\
- --libdir=%{slibdir}\
- --bit-depth=10
+ --disable-cli\
+ --libdir=%{slibdir}\
+ --bit-depth=10
%make_build
popd
4 years, 6 months
