DISTFILES: php-phpmailer: phpmailer-5.2.14.tar.gz
Request by: glen Files fetched: 1 STORED: https://github.com/PHPMailer/PHPMailer/archive/v5.2.14/phpmailer-5.2.14.tar.gz 51ea9638f44bdbf65dcc0b2314b45699 phpmailer-5.2.14.tar.gz Size: 192100 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php-phpmailer] Version 5.2.14 (Nov 1st 2015)
commit 0893ce72ca698204bad10d338084b122e576c33f Author: Elan RuusamäeDate: Thu Feb 25 09:11:31 2016 +0200 Version 5.2.14 (Nov 1st 2015) - Allow addresses with IDN (Internationalized Domain Name) in PHP 5.3+, thanks to @fbonzon - Allow access to POP3 errors - Make all POP3 private properties and methods protected - **SECURITY** Fix vulnerability that allowed email addresses with line breaks (valid in RFC5322) to pass to SMTP, permitting message injection at the SMTP level. Mitigated in both the address validator and in the lower-level SMTP class. Thanks to Takeshi Terada. - Updated Brazilian Portuguese translations (Thanks to @phelipealves) php-phpmailer.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/php-phpmailer.spec b/php-phpmailer.spec index 6d4457d..99f465e 100644 --- a/php-phpmailer.spec +++ b/php-phpmailer.spec @@ -8,12 +8,12 @@ Summary: Full featured email transfer class for PHP Summary(pl.UTF-8): W pełni funkcjonalna klasa PHP do przesyłania e-maili Name: php-%{pkgname} -Version: 5.2.13 +Version: 5.2.14 Release: 1 License: LGPL v2.1 Group: Development/Languages/PHP Source0: https://github.com/PHPMailer/PHPMailer/archive/v%{version}/%{pkgname}-%{version}.tar.gz -# Source0-md5: 4bfa6d2615eeb5ff600167507e8c87ca +# Source0-md5: 51ea9638f44bdbf65dcc0b2314b45699 URL: https://github.com/PHPMailer/PHPMailer BuildRequires: php-devel BuildRequires: php-pear-PhpDocumentor @@ -44,7 +44,7 @@ BuildRoot:%{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define_noautophp php-openssl php-mbstring php-filter php-hash # bad depsolver -%define_noautoreq_pear extras/ntlm_sasl_client.php PHPMailerAutoload.php +%define_noautoreq_pear extras/ntlm_sasl_client.php PHPMailerAutoload.php extras/.* # put it together for rpmbuild %define_noautoreq %{?_noautophp} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php-phpmailer.git/commitdiff/0893ce72ca698204bad10d338084b122e576c33f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ruby-re2] BR libstdc++-devel
commit 65024a0f6b373877e88e860b64d22b01b24641d4 Author: Elan RuusamäeDate: Thu Feb 25 06:54:51 2016 +0200 BR libstdc++-devel ruby-re2.spec | 1 + 1 file changed, 1 insertion(+) --- diff --git a/ruby-re2.spec b/ruby-re2.spec index c16193e..2f97f1b 100644 --- a/ruby-re2.spec +++ b/ruby-re2.spec @@ -12,6 +12,7 @@ Group:Development/Languages Source0: http://rubygems.org/downloads/%{pkgname}-%{version}.gem # Source0-md5: bc012bbef488bf365022e9cbbcb1ad3f URL: http://mudge.name/re2/ +BuildRequires: libstdc++-devel BuildRequires: re2-devel BuildRequires: rpm-rubyprov BuildRequires: rpmbuild(macros) >= 1.656 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ruby-re2.git/commitdiff/65024a0f6b373877e88e860b64d22b01b24641d4 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ruby-re2] update url
commit 97214d35a41bede268b4af0ee0143bc8da34976f Author: Elan RuusamäeDate: Thu Feb 25 06:48:21 2016 +0200 update url ruby-re2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/ruby-re2.spec b/ruby-re2.spec index dbfd32a..c16193e 100644 --- a/ruby-re2.spec +++ b/ruby-re2.spec @@ -11,7 +11,7 @@ License: BSD Group: Development/Languages Source0: http://rubygems.org/downloads/%{pkgname}-%{version}.gem # Source0-md5: bc012bbef488bf365022e9cbbcb1ad3f -URL: http://github.com/mudge/re2 +URL: http://mudge.name/re2/ BuildRequires: re2-devel BuildRequires: rpm-rubyprov BuildRequires: rpmbuild(macros) >= 1.656 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ruby-re2.git/commitdiff/97214d35a41bede268b4af0ee0143bc8da34976f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ruby-re2: re2-0.7.0.gem
Request by: glen Files fetched: 1 STORED: http://rubygems.org/downloads/re2-0.7.0.gem bc012bbef488bf365022e9cbbcb1ad3f re2-0.7.0.gem Size: 21504 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ruby-re2] Created branch master
The branch 'master' was created. Summary of new commits: 0fb22d2... new, version 0.7.0 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ruby-re2] new, version 0.7.0
commit 0fb22d2b0daf99bb88c305b1c8287282e520e340 Author: Elan RuusamäeDate: Thu Feb 25 06:46:53 2016 +0200 new, version 0.7.0 created with gem2spec ruby-re2.spec | 60 +++ 1 file changed, 60 insertions(+) --- diff --git a/ruby-re2.spec b/ruby-re2.spec new file mode 100644 index 000..dbfd32a --- /dev/null +++ b/ruby-re2.spec @@ -0,0 +1,60 @@ +# +# Conditional build: +%bcond_withtests # build without tests + +%definepkgname re2 +Summary: Ruby bindings to re2 +Name: ruby-%{pkgname} +Version: 0.7.0 +Release: 1 +License: BSD +Group: Development/Languages +Source0: http://rubygems.org/downloads/%{pkgname}-%{version}.gem +# Source0-md5: bc012bbef488bf365022e9cbbcb1ad3f +URL: http://github.com/mudge/re2 +BuildRequires: re2-devel +BuildRequires: rpm-rubyprov +BuildRequires: rpmbuild(macros) >= 1.656 +BuildRequires: ruby-devel +%if %{with tests} +BuildRequires: ruby-minitest < 6 +BuildRequires: ruby-minitest >= 5.4 +BuildRequires: ruby-rake-compiler < 1 +BuildRequires: ruby-rake-compiler >= 0.9 +%endif +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Ruby bindings to re2, an efficient, principled regular expression +library. + +%prep +%setup -q -n %{pkgname}-%{version} + +%build +# write .gemspec +%__gem_helper spec + +cd ext/%{pkgname} +%{__ruby} extconf.rb +%{__make} \ + CC="%{__cc}" \ + LDFLAGS="%{rpmldflags}" \ + CFLAGS="%{rpmcflags} -fPIC" + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_vendorarchdir},%{ruby_specdir}} +cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir} +cp -p %{pkgname}-%{version}.gemspec $RPM_BUILD_ROOT%{ruby_specdir} +install -p ext/re2/re2.so $RPM_BUILD_ROOT%{ruby_vendorarchdir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%{ruby_vendorlibdir}/re2.rb +%{ruby_vendorlibdir}/re2 +%{ruby_vendorarchdir}/re2.so +%{ruby_specdir}/%{pkgname}-%{version}.gemspec gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ruby-re2.git/commitdiff/0fb22d2b0daf99bb88c305b1c8287282e520e340 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: mpd: mpd-0.19.13.tar.xz
Request by: atler Files fetched: 1 STORED: http://www.musicpd.org/download/mpd/0.19/mpd-0.19.13.tar.xz 016c93fc3d78bfb92e896445f04ea741 mpd-0.19.13.tar.xz Size: 703564 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mpd] up to 0.19.13
commit ea5cd4570162b8d4ef9bddbfbb8ac1906ddd7b40 Author: Jan PalusDate: Thu Feb 25 01:12:39 2016 +0100 up to 0.19.13 mpd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/mpd.spec b/mpd.spec index c4aefde..78c0bb8 100644 --- a/mpd.spec +++ b/mpd.spec @@ -10,12 +10,12 @@ Summary:Music Player Daemon Summary(hu.UTF-8): Music Player Daemon Summary(pl.UTF-8): Music Player Daemon - demon odtwarzający muzykę Name: mpd -Version: 0.19.12 +Version: 0.19.13 Release: 1 License: GPL v2+ Group: Applications/Multimedia Source0: http://www.musicpd.org/download/mpd/0.19/%{name}-%{version}.tar.xz -# Source0-md5: acbef4339d854da509c8bf3b43f0657e +# Source0-md5: 016c93fc3d78bfb92e896445f04ea741 Source1: %{name}.conf Source2: %{name}.init Source3: %{name}.sysconfig gitweb: http://git.pld-linux.org/gitweb.cgi/packages/mpd.git/commitdiff/ea5cd4570162b8d4ef9bddbfbb8ac1906ddd7b40 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: groovy: apache-groovy-binary-2.4.6.zip
Request by: atler Files fetched: 1 STORED: https://dl.bintray.com/groovy/maven/apache-groovy-binary-2.4.6.zip 82d265186a651edb53bf187487966b92 apache-groovy-binary-2.4.6.zip Size: 36461535 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/groovy] up to 2.4.6
commit 704ebb24c32965cedf96b888ebf5a5d3b01c10d7 Author: Jan PalusDate: Thu Feb 25 01:10:17 2016 +0100 up to 2.4.6 groovy.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/groovy.spec b/groovy.spec index 9387120..cab4224 100644 --- a/groovy.spec +++ b/groovy.spec @@ -1,11 +1,11 @@ Summary: Dynamic language for the Java Platform Name: groovy -Version: 2.4.5 +Version: 2.4.6 Release: 1 License: Apache v2.0 Group: Development/Languages/Java Source0: https://dl.bintray.com/groovy/maven/apache-%{name}-binary-%{version}.zip -# Source0-md5: fc57ff9024e62a3699b5d8ccb6bc2787 +# Source0-md5: 82d265186a651edb53bf187487966b92 URL: http://groovy-lang.org/ Requires: jdk BuildArch: noarch gitweb: http://git.pld-linux.org/gitweb.cgi/packages/groovy.git/commitdiff/704ebb24c32965cedf96b888ebf5a5d3b01c10d7 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: glpk: glpk-4.58.tar.gz
Request by: qboosh Files fetched: 1 STORED: http://ftp.gnu.org/gnu/glpk/glpk-4.58.tar.gz 924ff878278d07a52f2e06240f2fe30a glpk-4.58.tar.gz Size: 3788237 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/glpk] - updated to 4.58 (note: new soname)
commit 04f0ed43dddf20410a3ccbd811fe3232b7fe051b Author: Jakub BoguszDate: Wed Feb 24 21:49:58 2016 +0100 - updated to 4.58 (note: new soname) glpk.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/glpk.spec b/glpk.spec index ed73d58..a134b7f 100644 --- a/glpk.spec +++ b/glpk.spec @@ -3,12 +3,12 @@ Summary: Solver LP and MIP problems Summary(pl.UTF-8): Narzędzie do rozwiązywania problemów LP i MIP Name: glpk -Version: 4.56 +Version: 4.58 Release: 1 License: GPL v3+ Group: Applications/Math Source0: http://ftp.gnu.org/gnu/glpk/%{name}-%{version}.tar.gz -# Source0-md5: 943c35cc8a02f80720dbd2a87ee8b18c +# Source0-md5: 924ff878278d07a52f2e06240f2fe30a Patch0:%{name}-dl.patch Patch1:%{name}-sonames.patch URL: http://www.gnu.org/software/glpk/glpk.html @@ -100,7 +100,7 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS ChangeLog NEWS README THANKS doc/{*.txt,*.pdf,notes} %attr(755,root,root) %{_bindir}/glpsol %attr(755,root,root) %{_libdir}/libglpk.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libglpk.so.36 +%attr(755,root,root) %ghost %{_libdir}/libglpk.so.39 %files devel %defattr(644,root,root,755) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/glpk.git/commitdiff/04f0ed43dddf20410a3ccbd811fe3232b7fe051b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-app-xrandr] - updated libXrandr version - separated xkeystone (to xorg-app-xkeystone), it requires nickle with c
commit 93fa005ffcae289dc8358af3a2730e5d3c51ed80 Author: Jakub BoguszDate: Wed Feb 24 21:03:47 2016 +0100 - updated libXrandr version - separated xkeystone (to xorg-app-xkeystone), it requires nickle with cairo binding xorg-app-xrandr.spec | 29 + 1 file changed, 25 insertions(+), 4 deletions(-) --- diff --git a/xorg-app-xrandr.spec b/xorg-app-xrandr.spec index 8624146..17a3b7f 100644 --- a/xorg-app-xrandr.spec +++ b/xorg-app-xrandr.spec @@ -2,7 +2,7 @@ Summary:xrandr application - command-line interface to RandR extension Summary(pl.UTF-8): Aplikacja xrandr - interfejs linii poleceń do rozszerzenia RandR Name: xorg-app-xrandr Version: 1.5.0 -Release: 0.1 +Release: 1 License: MIT Group: X11/Applications Source0: http://xorg.freedesktop.org/releases/individual/app/xrandr-%{version}.tar.bz2 @@ -11,10 +11,13 @@ URL:http://xorg.freedesktop.org/ BuildRequires: autoconf >= 2.60 BuildRequires: automake BuildRequires: pkgconfig >= 1:0.19 -BuildRequires: xorg-lib-libXrandr-devel >= 1.4 +BuildRequires: sed >= 4.0 +BuildRequires: xorg-lib-libX11-devel +BuildRequires: xorg-lib-libXrandr-devel >= 1.5 +BuildRequires: xorg-lib-libXrender-devel BuildRequires: xorg-proto-xproto-devel >= 7.0.17 BuildRequires: xorg-util-util-macros >= 1.8 -Requires: xorg-lib-libXrandr >= 1.4 +Requires: xorg-lib-libXrandr >= 1.5 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -25,6 +28,19 @@ outputs for a screen. xrandr służy do ustawiania rozmiaru, orientacji i/lub odbicia wyjścia ekranu. +%package -n xorg-app-xkeystone +Summary: xkeystone application to help setting keystone effect correction +Summary(pl.UTF-8): Aplikacja xkeystone pomagająca ustawić korekcję efektu trapezu +Group: X11/Applications +Requires: %{name} = %{version}-%{release} +Requires: nickle-cairo + +%description -n xorg-app-xkeystone +xkeystone application to help setting keystone effect correction. + +%description -n xorg-app-xkeystone -l pl.UTF-8 +Aplikacja xkeystone pomagająca ustawić korekcję efektu trapezu. + %prep %setup -q -n xrandr-%{version} @@ -43,12 +59,17 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +%{__sed} -i -e '1s,/usr/bin/env nickle,/usr/bin/nickle,' $RPM_BUILD_ROOT%{_bindir}/xkeystone + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %doc COPYING ChangeLog README -%attr(755,root,root) %{_bindir}/xkeystone %attr(755,root,root) %{_bindir}/xrandr %{_mandir}/man1/xrandr.1* + +%files -n xorg-app-xkeystone +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/xkeystone gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-app-xrandr.git/commitdiff/93fa005ffcae289dc8358af3a2730e5d3c51ed80 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/glibc] - up from upstream branch
commit 3f606caf48ebf4480f3b4995644a3a845a7cf87b Author: Arkadiusz MiśkiewiczDate: Wed Feb 24 20:35:32 2016 +0100 - up from upstream branch glibc-git.patch | 124 +++- 1 file changed, 122 insertions(+), 2 deletions(-) --- diff --git a/glibc-git.patch b/glibc-git.patch index a7b6f1f..12f94b7 100644 --- a/glibc-git.patch +++ b/glibc-git.patch @@ -1,8 +1,27 @@ diff --git a/ChangeLog b/ChangeLog -index 2e4afb7..f5ae211 100644 +index 2e4afb7..7895446 100644 --- a/ChangeLog +++ b/ChangeLog -@@ -1,5 +1,38 @@ +@@ -1,5 +1,57 @@ ++2016-02-22 Roland McGrath ++ ++ * sysdeps/arm/nacl/libc.abilist (GLIBC_2.23): Add GLIBC_2.23, ++ fts64_children, fts64_close, fts64_open, fts64_read and fts64_set. ++ ++2016-02-22 H.J. Lu ++ ++ [BZ #19679] ++ * sysdeps/x86_64/dl-trampoline.S (DL_RUNIME_UNALIGNED_VEC_SIZE): ++ Renamed to ... ++ (DL_RUNTIME_UNALIGNED_VEC_SIZE): This. Set to 8. ++ (DL_RUNIME_RESOLVE_REALIGN_STACK): Renamed to ... ++ (DL_RUNTIME_RESOLVE_REALIGN_STACK): This. Updated. ++ (DL_RUNIME_RESOLVE_REALIGN_STACK): Renamed to ... ++ (DL_RUNTIME_RESOLVE_REALIGN_STACK): This. ++ * sysdeps/x86_64/dl-trampoline.h ++ (DL_RUNIME_RESOLVE_REALIGN_STACK): Renamed to ... ++ (DL_RUNTIME_RESOLVE_REALIGN_STACK): This. ++ 2016-02-18 Adhemerval Zanella + * configure: Regenerated. @@ -55046,3 +55065,104 @@ index 90c47e4..9ca8cb1 100644 #~ msgid "compile-time support for database policy missing" #~ msgstr "compile-time 支援用於資料庫策略缺少" +diff --git a/sysdeps/arm/nacl/libc.abilist b/sysdeps/arm/nacl/libc.abilist +index 561441e..0560510 100644 +--- a/sysdeps/arm/nacl/libc.abilist b/sysdeps/arm/nacl/libc.abilist +@@ -1834,3 +1834,9 @@ GLIBC_2.22 wprintf F + GLIBC_2.22 write F + GLIBC_2.22 writev F + GLIBC_2.22 wscanf F ++GLIBC_2.23 GLIBC_2.23 A ++GLIBC_2.23 fts64_children F ++GLIBC_2.23 fts64_close F ++GLIBC_2.23 fts64_open F ++GLIBC_2.23 fts64_read F ++GLIBC_2.23 fts64_set F +diff --git a/sysdeps/x86_64/dl-trampoline.S b/sysdeps/x86_64/dl-trampoline.S +index 9fb6b13..39b8771 100644 +--- a/sysdeps/x86_64/dl-trampoline.S b/sysdeps/x86_64/dl-trampoline.S +@@ -33,15 +33,19 @@ + # define DL_STACK_ALIGNMENT 8 + #endif + +-#ifndef DL_RUNIME_UNALIGNED_VEC_SIZE +-/* The maximum size of unaligned vector load and store. */ +-# define DL_RUNIME_UNALIGNED_VEC_SIZE 16 ++#ifndef DL_RUNTIME_UNALIGNED_VEC_SIZE ++/* The maximum size in bytes of unaligned vector load and store in the ++ dynamic linker. Since SSE optimized memory/string functions with ++ aligned SSE register load and store are used in the dynamic linker, ++ we must set this to 8 so that _dl_runtime_resolve_sse will align the ++ stack before calling _dl_fixup. */ ++# define DL_RUNTIME_UNALIGNED_VEC_SIZE 8 + #endif + + /* True if _dl_runtime_resolve should align stack to VEC_SIZE bytes. */ +-#define DL_RUNIME_RESOLVE_REALIGN_STACK \ ++#define DL_RUNTIME_RESOLVE_REALIGN_STACK \ + (VEC_SIZE > DL_STACK_ALIGNMENT \ +- && VEC_SIZE > DL_RUNIME_UNALIGNED_VEC_SIZE) ++ && VEC_SIZE > DL_RUNTIME_UNALIGNED_VEC_SIZE) + + /* Align vector register save area to 16 bytes. */ + #define REGISTER_SAVE_VEC_OFF 0 +@@ -76,7 +80,7 @@ + #ifdef HAVE_AVX512_ASM_SUPPORT + # define VEC_SIZE 64 + # define VMOVAvmovdqa64 +-# if DL_RUNIME_RESOLVE_REALIGN_STACK || VEC_SIZE <= DL_STACK_ALIGNMENT ++# if DL_RUNTIME_RESOLVE_REALIGN_STACK || VEC_SIZE <= DL_STACK_ALIGNMENT + # define VMOVvmovdqa64 + # else + # define VMOVvmovdqu64 +@@ -100,7 +104,7 @@ strong_alias (_dl_runtime_profile_avx, _dl_runtime_profile_avx512) + + #define VEC_SIZE 32 + #define VMOVA vmovdqa +-#if DL_RUNIME_RESOLVE_REALIGN_STACK || VEC_SIZE <= DL_STACK_ALIGNMENT ++#if DL_RUNTIME_RESOLVE_REALIGN_STACK || VEC_SIZE <= DL_STACK_ALIGNMENT + # define VMOV vmovdqa + #else + # define VMOV vmovdqu +@@ -119,7 +123,7 @@ strong_alias (_dl_runtime_profile_avx, _dl_runtime_profile_avx512) + /* movaps/movups is 1-byte shorter. */ + #define VEC_SIZE 16 + #define VMOVA movaps +-#if DL_RUNIME_RESOLVE_REALIGN_STACK || VEC_SIZE <= DL_STACK_ALIGNMENT ++#if DL_RUNTIME_RESOLVE_REALIGN_STACK || VEC_SIZE <= DL_STACK_ALIGNMENT + # define VMOV movaps + #else + # define VMOV movups +diff --git a/sysdeps/x86_64/dl-trampoline.h b/sysdeps/x86_64/dl-trampoline.h +index f419183..b90836a 100644 +--- a/sysdeps/x86_64/dl-trampoline.h b/sysdeps/x86_64/dl-trampoline.h +@@ -30,7 +30,7 @@ + #undef REGISTER_SAVE_AREA + #undef LOCAL_STORAGE_AREA + #undef BASE +-#if DL_RUNIME_RESOLVE_REALIGN_STACK ++#if DL_RUNTIME_RESOLVE_REALIGN_STACK + # define REGISTER_SAVE_AREA (REGISTER_SAVE_AREA_RAW + 8) + /* Local stack area
[packages/hplip] - non-parallel install
commit 59e967ed0a4aa7b3ebb50a4e20e82c9f2a94ba78 Author: Jakub BoguszDate: Wed Feb 24 18:24:45 2016 +0100 - non-parallel install hplip.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/hplip.spec b/hplip.spec index 078c5f9..e67847a 100644 --- a/hplip.spec +++ b/hplip.spec @@ -201,7 +201,7 @@ CXXFLAGS="%{rpmcflags} -fno-exceptions -fno-rtti" rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/var/lib/hp -%{__make} install \ +%{__make} -j1 install \ DESTDIR=$RPM_BUILD_ROOT touch $RPM_BUILD_ROOT/var/lib/hp/hplip.state gitweb: http://git.pld-linux.org/gitweb.cgi/packages/hplip.git/commitdiff/59e967ed0a4aa7b3ebb50a4e20e82c9f2a94ba78 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: zimg-storage: zimg-3.1.0.tar.gz
Request by: qboosh Files fetched: 1 STORED: https://github.com/buaazp/zimg/archive/v3.1.0/zimg-3.1.0.tar.gz e2d003f9fe981ff7839a8a47b9a54dcc zimg-3.1.0.tar.gz Size: 1084592 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/zimg-storage] Created branch master
The branch 'master' was created. Summary of new commits: b62b66b... - initial ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/zimg-storage] - initial
commit b62b66be06f6aed5130839455a9d71aa4d0d7d51 Author: Jakub BoguszDate: Wed Feb 24 18:20:23 2016 +0100 - initial zimg-storage.spec | 65 +++ zimg-system-lua.patch | 21 + 2 files changed, 86 insertions(+) --- diff --git a/zimg-storage.spec b/zimg-storage.spec new file mode 100644 index 000..15210bc --- /dev/null +++ b/zimg-storage.spec @@ -0,0 +1,65 @@ +# NOTE: zimg name reserved for https://github.com/sekrit-twc/zimg +# TODO: +# - system libevhtp, hiredis, ... +# - use (lib)onig +# - use plain lua where luajit not available (see system-lua for appropriate variables) +# +# Conditional build: +%bcond_without apidocs # do not build and package API docs +%bcond_without static_libs # don't build static libraries +# +Summary: Light image storage and processing system +Summary(pl.UTF-8): Lekki system do przechowywania i przetwarzania obrazów +Name: zimg-storage +Version: 3.1.0 +Release: 0.1 +License: BSD +Group: Applications/Graphics +#Source0Download: https://github.com/buaazp/zimg/releases +Source0: https://github.com/buaazp/zimg/archive/v%{version}/zimg-%{version}.tar.gz +# Source0-md5: e2d003f9fe981ff7839a8a47b9a54dcc +Patch0:zimg-system-lua.patch +URL: http://zimg.buaa.us/ +BuildRequires: ImageMagick-devel +BuildRequires: cmake >= 2.8 +BuildRequires: libevent-devel >= 2.0.20 +BuildRequires: libmemcached-devel >= 1.0.8 +BuildRequires: luajit-devel >= 2.0.4 +BuildRequires: openssl-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Project zimg is a light image storage and processing system. It's +written by C and it has high performance in image field. The zimg is +designed for high concurrency image server. It supports many features +for storing and processing images. + +%description -l pl.UTF-8 +Projekt zimg to lekki system do przechowywania i przetwarzania +obrazów. Jest napisany w C ze zwróceniem uwagi na wysoką wydajność. +Jest przeznaczony dla serwera obrazów o dużym zrównolegleniu. +Obsługuje wiele opcji do przechowywania i przetwarzania obrazów. + +%prep +%setup -q -n zimg-%{version} +%patch0 -p1 + +%build +install -d build +cd build +%cmake ../src +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_bindir} + +install build/zimg $RPM_BUILD_ROOT%{_bindir}/zimg + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc LICENSE README.md +%attr(755,root,root) %{_bindir}/zimg diff --git a/zimg-system-lua.patch b/zimg-system-lua.patch new file mode 100644 index 000..bd80254 --- /dev/null +++ b/zimg-system-lua.patch @@ -0,0 +1,21 @@ +--- zimg-3.1.0/src/CMakeLists.txt.orig 2014-09-08 17:29:15.0 +0200 zimg-3.1.0/src/CMakeLists.txt 2016-02-23 16:52:13.753332122 +0100 +@@ -82,8 +82,8 @@ + set (DEPS_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../deps") + include_directories(${DEPS_SOURCE_DIR}) + +-set (LUAJIT_INCLUDE_DIR ${DEPS_SOURCE_DIR}/LuaJIT-2.0.3/src) +-set (LUAJIT_LIBRARIES ${DEPS_SOURCE_DIR}/LuaJIT-2.0.3/src/libluajit.a) ++set (LUAJIT_INCLUDE_DIR "/usr/include/luajit-2.0" CACHE STRING "Lua include dir") ++set (LUAJIT_LIBRARIES "luajit-5.1" CACHE STRING "Lua library") + + #set (ImageMagick_INCLUDE_DIRS "/Users/zippo/develop/linuxc/imagemagick-src") + #set (ImageMagick_MagickCore_LIBRARY "/Users/zippo/develop/linuxc/imagemagick-src/magick/.libs/libMagickCore-Q16.a") +@@ -149,7 +149,6 @@ + message("Build Type: ${CMAKE_BUILD_TYPE}") + message("Std CFLAGS: ${CMAKE_C_FLAGS}") + +-link_directories("/usr/lib" "/usr/local/lib") + add_executable(zimg ${SOURCES}) + target_link_libraries(zimg ${ZIMG_EXTERNAL_LIBS}) + gitweb: http://git.pld-linux.org/gitweb.cgi/packages/zimg-storage.git/commitdiff/b62b66be06f6aed5130839455a9d71aa4d0d7d51 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-video-nvidia/Vulkan] fix kernel-only build
commit e948855172b1ce852d1a30904363c28be80d02c5 Author: Jacek KoniecznyDate: Wed Feb 24 17:32:53 2016 +0100 fix kernel-only build xorg-driver-video-nvidia.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 429adf5..982d06b 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -329,6 +329,8 @@ ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1 ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so ln -sf libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libcuda.so ln -sf libnvcuvid.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libnvcuvid.so + +install nvidia_icd.json $RPM_BUILD_ROOT%{_datadir}/vulkan/icd.d %endif %if %{with kernel} @@ -344,8 +346,6 @@ sed -e ' s|@@version@@|%{version}|g' < %{SOURCE3} \ > $RPM_BUILD_ROOT%{_pkgconfigdir}/gl.pc -install nvidia_icd.json $RPM_BUILD_ROOT%{_datadir}/vulkan/icd.d - %clean rm -rf $RPM_BUILD_ROOT gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia.git/commitdiff/e948855172b1ce852d1a30904363c28be80d02c5 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: hplip: hplip-3.16.2.tar.gz
Request by: qboosh Files fetched: 1 STORED: http://downloads.sourceforge.net/hplip/hplip-3.16.2.tar.gz e024f3b52b3b5be66da843fba7da4cf5 hplip-3.16.2.tar.gz Size: 22285808 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/hplip] - updated to 3.16.2 - updated unresolved,udev-rules patches
commit 215a0dee2167e97b17efa31d6984e0719bb7c2f9 Author: Jakub BoguszDate: Wed Feb 24 17:38:48 2016 +0100 - updated to 3.16.2 - updated unresolved,udev-rules patches hplip-udev-rules.patch | 19 +-- hplip.spec | 16 +++- unresolved.patch | 26 ++ 3 files changed, 38 insertions(+), 23 deletions(-) --- diff --git a/hplip.spec b/hplip.spec index 6d9e058..078c5f9 100644 --- a/hplip.spec +++ b/hplip.spec @@ -13,12 +13,12 @@ Summary: Hewlett-Packard Linux Imaging and Printing suite - printing and scanning using HP devices Summary(pl.UTF-8): Narzędzia Hewlett-Packard Linux Imaging and Printing - drukowanie i skanowanie przy użyciu urządzeń HP Name: hplip -Version: 3.14.4 +Version: 3.16.2 Release: 1 License: BSD (hpijs), MIT (low-level scanning and printing code), GPL v2 (the rest) Group: Applications/System Source0: http://downloads.sourceforge.net/hplip/%{name}-%{version}.tar.gz -# Source0-md5: 6e8d53fb2284271505d2e1706c01f6c5 +# Source0-md5: e024f3b52b3b5be66da843fba7da4cf5 Patch0:%{name}-desktop.patch Patch1:unresolved.patch Patch2:pld-distro.patch @@ -168,7 +168,9 @@ urządzenia HP AiO. #%patch3 -p1 %patch5 -p1 -%{__sed} -i -e's,^#!/usr/bin/env python$,#!/usr/bin/python,' *.py +%{__sed} -i -e '1s,^#!/usr/bin/env python$,#!%{__python},' *.py fax/filters/pstotiff prnt/filters/hpps +find base fax installer prnt scan ui ui4 -name '*.py' | xargs \ + %{__sed} -i -e '1s,^#!/usr/bin/env python$,#!%{__python},' %{__sed} -i -e 's#test -d /usr/share/polkit-1#true#' configure.in %build @@ -219,10 +221,10 @@ ln -s %{cups_filterdir}/foomatic-rip $RPM_BUILD_ROOT%{cups_filterdir}/foomatic-r %{__rm} $RPM_BUILD_ROOT/etc/sane.d/dll.conf # junk %{__rm} $RPM_BUILD_ROOT{%{_bindir}/hp-{uninstall,upgrade},%{_datadir}/hplip/{uninstall,upgrade}.py} -%{__rm} $RPM_BUILD_ROOT/usr/%{systemdunitdir}/hplip-printer@.service +%{__rm} $RPM_BUILD_ROOT/usr/lib/systemd/system/hplip-printer@.service %if %{without fax} -rm $RPM_BUILD_ROOT%{cups_filterdir}/pstotiff +%{__rm} $RPM_BUILD_ROOT%{cups_filterdir}/pstotiff %endif # use udev, hal's dead @@ -361,8 +363,12 @@ fi %files libs %defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libhpdiscovery.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libhpdiscovery.so.0 %attr(755,root,root) %{_libdir}/libhpip.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libhpip.so.0 +%attr(755,root,root) %{_libdir}/libhpipp.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libhpipp.so.0 %attr(755,root,root) %{_libdir}/libhpmud.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libhpmud.so.0 diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch index 7d2e5e4..9672e4d 100644 --- a/hplip-udev-rules.patch +++ b/hplip-udev-rules.patch @@ -1,14 +1,13 @@ hplip-3.14.4/data/rules/56-hpmud.rules.orig2014-05-27 15:39:55.510795837 +0200 -+++ hplip-3.14.4/data/rules/56-hpmud.rules 2014-05-27 15:42:45.834125604 +0200 -@@ -11,8 +11,6 @@ LABEL="hpmud_usb_rules" - ATTR{idVendor}=="03f0", ATTR{idProduct}=="", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes", ENV{hp_test}="yes", ENV{ID_HPLIP}="1" +--- hplip-3.16.2/data/rules/56-hpmud.rules.orig2016-02-22 17:40:19.056836902 +0100 hplip-3.16.2/data/rules/56-hpmud.rules 2016-02-22 17:41:52.463499649 +0100 +@@ -12,7 +12,4 @@ + # ENV{ID_HPLIP}="1" is for Ubuntu udev-acl + ATTR{idVendor}=="03f0", ENV{ID_USB_INTERFACES}=="*:0701??:*|*:08:", OWNER="root", GROUP="lp", MODE="0664", ENV{libsane_matched}="yes", ENV{hp_test}="yes", ENV{ID_HPLIP}="1" - --# This rule will add the printer and install plugin --ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c 'if [ -f /usr/bin/systemctl ]; then /usr/bin/systemctl --no-block start hplip-printer@$env{BUSNUM}:$env{DEVNUM}.service; else /usr/bin/nohup /usr/bin/python /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM} ; fi &'" - - # If sane-bankends is installed add hpaio backend support to dll.conf if needed. - ENV{sane_hpaio}=="yes", RUN+="/bin/sh -c 'grep -q ^#hpaio /etc/sane.d/dll.conf;if [ $$? -eq 0 ];then sed -i -e s/^#hpaio/hpaio/ /etc/sane.d/dll.conf;else grep -q ^hpaio /etc/sane.d/dll.conf;if [ $$? -ne 0 ];then echo hpaio >>/etc/sane.d/dll.conf;fi;fi'" +-# This rule will check the smart install feature, plugin status and firmware download for the required printers. +-ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/nohup /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM}'" +- + LABEL="hpmud_rules_end" diff -up hplip-3.13.6/Makefile.am.udev-rules hplip-3.13.6/Makefile.am ---
DISTFILES: xorg-driver-video-nvidia: NVIDIA-Linux-x86-355.00.28.run NVIDIA-Linux-x86_64-355.00.28.run
Request by: j.konieczny Files fetched: 2 STORED: no-url://NVIDIA-Linux-x86-355.00.28.run 976b573d63fe649dd383396b74a1e9f5 NVIDIA-Linux-x86-355.00.28.run Size: 43443026 bytes STORED: no-url://NVIDIA-Linux-x86_64-355.00.28.run ba5223c5210ec78c0857678e013517be NVIDIA-Linux-x86_64-355.00.28.run Size: 77355954 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ERROR fetching sources for Usage (refs/heads/master)
Requester: j.konieczny cannot git fetch Usage from branch refs/heads/master; fatal: remote error: access denied or repository not exported: /packages/Usage exited with code 128 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/Mesa-vulkan-icd-intel] P: vulkan(icd), S: vulkan(loader)
commit 139fac9fbd78ceed7dc9b664f69347429ea8d340 Author: Jacek KoniecznyDate: Wed Feb 24 13:32:27 2016 +0100 P: vulkan(icd), S: vulkan(loader) Release: 3 Mesa-vulkan-icd-intel.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- diff --git a/Mesa-vulkan-icd-intel.spec b/Mesa-vulkan-icd-intel.spec index 8b292de..955c60f 100644 --- a/Mesa-vulkan-icd-intel.spec +++ b/Mesa-vulkan-icd-intel.spec @@ -9,7 +9,7 @@ Summary: Vulkan driver for Intel GPUs Name: Mesa-vulkan-icd-intel Version: 0.s%{snap} -Release: 2 +Release: 3 License: MIT (core) and others - see license.html file Group: X11/Libraries # git archive --format=tar --prefix=Mesa-vulkan-s20160220/ vulkan | xz > ../Mesa-vulkan-s20160220.tar.xz @@ -52,7 +52,8 @@ BuildRequires:xorg-lib-libXxf86vm-devel BuildRequires: xorg-lib-libxshmfence-devel >= 1.1 BuildRequires: xorg-proto-dri3proto-devel >= %{dri3proto_ver} BuildRequires: xorg-util-makedepend -Requires: vulkan-loader +Suggests: vulkan(loader) +Provides: vulkan(icd) = 1.0.3 ExclusiveArch: %x8664 x32 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/Mesa-vulkan-icd-intel.git/commitdiff/139fac9fbd78ceed7dc9b664f69347429ea8d340 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: xorg-driver-video-nvidia: ERRORS: NVIDIA-Linux-x86-355.00.28.run NVIDIA-Linux-x86_64-355.00.28.run
Request by: jajcus FATAL: NVIDIA-Linux-x86-355.00.28.run was not uploaded FATAL: NVIDIA-Linux-x86_64-355.00.28.run was not uploaded Files fetched: 0 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-video-nvidia/Vulkan] Experimental nVidia Vulkan drivers
commit 3bf4370d68e0e284ebc4d2acf3f963f51d771fc8 Author: Jacek KoniecznyDate: Wed Feb 24 13:35:25 2016 +0100 Experimental nVidia Vulkan drivers Version: 355.00.28 xorg-driver-video-nvidia.spec | 26 -- 1 file changed, 16 insertions(+), 10 deletions(-) --- diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 7015cdb..429adf5 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -32,22 +32,23 @@ Summary(hu.UTF-8): Linux meghajtók nVidia GeForce/Quadro chipekhez Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia GeForce/Quadro Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel} # when updating version here, keep nvidia-settings.spec in sync as well -Version: 361.28 -Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}} +Version: 355.00.28 +Release: %{rel}vulkan%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}} Epoch: 1 License: nVidia Binary Group: X11 -Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run -# Source0-md5: d4fc7fcf1204a46f15733d7cc2711ad2 -Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run -# Source1-md5: 8799b9a29ea1ef72feb739f1d8290728 +# http://developer.download.nvidia.com/assets/gameworks/downloads/secure/Vulkan_Beta_Drivers/NVIDIA-Linux-x86_64-355.00.28.run?autho=1456314747_c2356a23598f1a881ac80c7f995dad4f=NVIDIA-Linux-x86_64-355.00.28.run +Source0: NVIDIA-Linux-x86-%{version}.run +# Source0-md5: 976b573d63fe649dd383396b74a1e9f5 +Source1: NVIDIA-Linux-x86_64-%{version}.run +# Source1-md5: ba5223c5210ec78c0857678e013517be Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Source4: 10-nvidia.conf Source5: 10-nvidia-modules.conf Patch0:X11-driver-nvidia-GL.patch Patch1:X11-driver-nvidia-desktop.patch -URL: http://www.nvidia.com/object/unix.html +URL: https://developer.nvidia.com/vulkan-driver BuildRequires: rpmbuild(macros) >= 1.701 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}} BuildRequires: sed >= 4.0 @@ -58,6 +59,7 @@ Requires: xorg-xserver-server(videodrv-abi) <= 20.0 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 Provides: ocl-icd(nvidia) Provides: ocl-icd-driver +Provides: vulkan(icd) = 1.0.3 Provides: xorg-driver-video Provides: xorg-xserver-module(glx) Obsoletes: XFree86-driver-nvidia @@ -231,7 +233,7 @@ cd kernel\ %{__make} SYSSRC=%{_kernelsrcdir} clean\ %{__make} SYSSRC=%{_kernelsrcdir} IGNORE_CC_MISMATCH=1 module\ cd ..\ -%install_kernel_modules -D installed -m kernel/nvidia,kernel/nvidia-modeset -d misc\ +%install_kernel_modules -D installed -m kernel/nvidia -d misc\ %ifarch %{x8664}\ %install_kernel_modules -D installed -m kernel/nvidia-uvm -d misc\ %endif\ @@ -247,7 +249,7 @@ rm -rf NVIDIA-Linux-x86*-%{version}* %setup -qDT -n NVIDIA-Linux-x86-%{version} %else /bin/sh %{SOURCE1} --extract-only -%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-no-compat32 +%setup -qDT -n NVIDIA-Linux-x86_64-%{version} %endif %patch0 -p1 %patch1 -p1 @@ -263,7 +265,8 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_libdir}/{nvidia,xorg/modules/{drivers,extensions/nvidia}} \ $RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir}/vdpau,%{_bindir},%{_mandir}/man1} \ $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d} \ - $RPM_BUILD_ROOT%{_sysconfdir}/{OpenCL/vendors,ld.so.conf.d,X11/xorg.conf.d} + $RPM_BUILD_ROOT%{_sysconfdir}/{OpenCL/vendors,ld.so.conf.d,X11/xorg.conf.d} \ + $RPM_BUILD_ROOT%{_datadir}/vulkan/icd.d %if %{with settings} install -p nvidia-settings $RPM_BUILD_ROOT%{_bindir} @@ -341,6 +344,8 @@ sed -e ' s|@@version@@|%{version}|g' < %{SOURCE3} \ > $RPM_BUILD_ROOT%{_pkgconfigdir}/gl.pc +install nvidia_icd.json $RPM_BUILD_ROOT%{_datadir}/vulkan/icd.d + %clean rm -rf $RPM_BUILD_ROOT @@ -368,6 +373,7 @@ EOF %attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so %{_sysconfdir}/X11/xorg.conf.d/10-nvidia.conf %{_sysconfdir}/X11/xorg.conf.d/10-nvidia-modules.conf +%{_datadir}/vulkan/icd.d/nvidia_icd.json %files libs %defattr(644,root,root,755) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia.git/commitdiff/3bf4370d68e0e284ebc4d2acf3f963f51d771fc8 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-video-nvidia] Created branch Vulkan
The branch 'Vulkan' was created. Summary of new commits: 3bf4370... Experimental nVidia Vulkan drivers ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/vulkan-sdk] vktrace binaries use '32' suffix on 32bit archs
commit a382f778a75686e44c87631e90c352e8465dd1d3 Author: Jacek KoniecznyDate: Wed Feb 24 12:50:17 2016 +0100 vktrace binaries use '32' suffix on 32bit archs That is for multilib install, package it that way. vulkan-sdk.spec | 22 +++--- 1 file changed, 19 insertions(+), 3 deletions(-) --- diff --git a/vulkan-sdk.spec b/vulkan-sdk.spec index 605024e..9265b7d 100644 --- a/vulkan-sdk.spec +++ b/vulkan-sdk.spec @@ -182,10 +182,19 @@ for f in layers/*.json ; do sed -e's@"library_path": "./@"library_path": "%{_libdir}/vulkan/layer/@' $f > $RPM_BUILD_ROOT%{_datadir}/vulkan/explicit_layer.d/$(basename $f) done +%ifarch %x8664 cp -p vktrace/libVkLayer_vktrace_layer.so $RPM_BUILD_ROOT%{_libdir}/vulkan/layer cp -p vktrace/vkreplay $RPM_BUILD_ROOT%{_bindir} cp -p vktrace/vktrace $RPM_BUILD_ROOT%{_bindir} -sed -e's@"library_path": "./@"library_path": "%{_libdir}/vulkan/layer/@' ../vktrace/src/vktrace_layer/linux/VkLayer_vktrace_layer.json > $RPM_BUILD_ROOT%{_datadir}/vulkan/explicit_layer.d/VkLayer_vktrace_layer.json +%else +cp -p vktrace/libVkLayer_vktrace_layer32.so $RPM_BUILD_ROOT%{_libdir}/vulkan/layer +cp -p vktrace/vkreplay32 $RPM_BUILD_ROOT%{_bindir} +cp -p vktrace/vktrace32 $RPM_BUILD_ROOT%{_bindir} +rm $RPM_BUILD_ROOT%{_datadir}/vulkan/explicit_layer.d/VkLayer_vktrace_layer.json +sed -e's@"library_path": "./@"library_path": "%{_libdir}/vulkan/layer/@' \ +-e's@libVkLayer_vktrace_layer.so@libVkLayer_vktrace_layer32.so@' \ + layers/VkLayer_vktrace_layer.json > $RPM_BUILD_ROOT%{_datadir}/vulkan/explicit_layer.d/VkLayer_vktrace_layer32.json +%endif cd ../.. @@ -230,10 +239,18 @@ rm -rf $RPM_BUILD_ROOT %doc vktrace-README.md vktrace-TODO.md %attr(755,root,root) %{_bindir}/vkjson_info %attr(755,root,root) %{_bindir}/vkjson_unittest +%attr(755,root,root) %{_bindir}/vulkaninfo +%ifarch %x8664 %attr(755,root,root) %{_bindir}/vkreplay %attr(755,root,root) %{_bindir}/vktrace -%attr(755,root,root) %{_bindir}/vulkaninfo %attr(755,root,root) %{_libdir}/vulkan/layer/libVkLayer_vktrace_layer.so +%{_datadir}/vulkan/explicit_layer.d/VkLayer_vktrace_layer.json +%else +%attr(755,root,root) %{_bindir}/vkreplay32 +%attr(755,root,root) %{_bindir}/vktrace32 +%attr(755,root,root) %{_libdir}/vulkan/layer/libVkLayer_vktrace_layer32.so +%{_datadir}/vulkan/explicit_layer.d/VkLayer_vktrace_layer32.json +%endif %files -n vulkan-validation-layers %defattr(644,root,root,755) @@ -273,7 +290,6 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/vulkan/explicit_layer.d/VkLayer_generic.json %{_datadir}/vulkan/explicit_layer.d/VkLayer_multi.json %{_datadir}/vulkan/explicit_layer.d/VkLayer_screenshot.json -%{_datadir}/vulkan/explicit_layer.d/VkLayer_vktrace_layer.json %files -n vulkan-devel %defattr(644,root,root,755) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/vulkan-sdk.git/commitdiff/a382f778a75686e44c87631e90c352e8465dd1d3 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/vulkan-sdk] Run ldconfig for vulkan-loader
commit d8d42412f69a36a5505746526cfb175346183fca Author: Jacek KoniecznyDate: Wed Feb 24 12:16:03 2016 +0100 Run ldconfig for vulkan-loader vulkan-sdk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/vulkan-sdk.spec b/vulkan-sdk.spec index 006dccf..605024e 100644 --- a/vulkan-sdk.spec +++ b/vulkan-sdk.spec @@ -195,8 +195,8 @@ cp -p VulkanTools/vktrace/TODO.md vktrace-TODO.md %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig -%postun-p /sbin/ldconfig +%post -n vulkan-loader -p /sbin/ldconfig +%postun-n vulkan-loader -p /sbin/ldconfig %files %defattr(644,root,root,755) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/vulkan-sdk.git/commitdiff/a382f778a75686e44c87631e90c352e8465dd1d3 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: vulkan-sdk: Vulkan-LoaderAndValidationLayers-s20160223.tar.gz VulkanTools-s20160223.tar.gz
Request by: jajcus Files fetched: 2 STORED: https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/b654da708be8f14e7f4c6f78df656229939422c8/Vulkan-LoaderAndValidationLayers-s20160223.tar.gz 25e8092b69d15090af5cada36d4fc92d Vulkan-LoaderAndValidationLayers-s20160223.tar.gz Size: 15178935 bytes STORED: https://github.com/LunarG/VulkanTools/archive/e5dccf86cf999ff9988be97337d0e3a3d508b085/VulkanTools-s20160223.tar.gz 89ae56a0c0270a7043548bc30c99aa36 VulkanTools-s20160223.tar.gz Size: 7182954 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/vulkan-sdk] I give up, building those separately makes no sense
commit 0c2b688d6cd86269bd9d8c1a6a9d3d530ff67256 Author: Jacek KoniecznyDate: Wed Feb 24 11:14:02 2016 +0100 I give up, building those separately makes no sense Upstream binary release is a single 'SDK' package, built from both Vulkan-LoaderAndValidationLayers and VulkanTools repositories. rpath.patch | 24 + system_glslang.patch | 107 +++ vulkan-loader.spec | 169 -- vulkan-sdk.spec | 285 +++ 4 files changed, 395 insertions(+), 190 deletions(-) --- diff --git a/vulkan-loader.spec b/vulkan-loader.spec deleted file mode 100644 index 2084e78..000 --- a/vulkan-loader.spec +++ /dev/null @@ -1,169 +0,0 @@ -# -# Conditional build: -%bcond_withtests # build with tests (require a working Vulkan - # driver (ICD)) -%define snap 20160222 -%define commit b654da708be8f14e7f4c6f78df656229939422c8 -%definerel 1 -Summary: Vulkan API loader -Name: vulkan-loader -Version: 1.0.3.0 -Release: 3.s%{snap}.%{rel} -License: MIT-like -Group: Applications -Source0: https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/%{commit}/%{name}-s%{snap}.tar.gz -# Source0-md5: 25e8092b69d15090af5cada36d4fc92d -Patch0:system_glslang.patch -URL: https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers -#BuildRequires:LunarGLASS-devel -BuildRequires: cmake -BuildRequires: glslang -BuildRequires: glslang-devel -BuildRequires: python3 -BuildRequires: python3-modules -BuildRequires: spirv-tools-devel -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) - -%description -Common loader for Vulkan API drivers. - -%package -n vulkan-layers -Summary: Validation layers for Vulkan -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description -n vulkan-layers -Validation layers for Vulkan. - -%package -n vulkan-devel -Summary: Header files for the Vulkan API -Summary(pl.UTF-8): Pliki nagłówkowe API Vulkan -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description -n vulkan-devel -Header files for the Vulkan API. - -%description -n vulkan-devel -l pl.UTF-8 -Pliki nagłówkowe API Vulkan. - -%package demos -Summary: Vulkan demos -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description demos -Vulkan demos. - -%package utils -Summary: Vulkan loader utilities -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description utils -Vulkan loader utilities. - -%prep -%setup -qn Vulkan-LoaderAndValidationLayers-%{commit} -%patch0 -p1 - -%build -install -d build -cd build -%cmake \ - -DCMAKE_INSTALL_DATADIR=share \ - -DCMAKE_INSTALL_SYSCONFDIR=etc \ - %{?with_tests:-DBUILD_TESTS=ON} \ - %{!?with_tests:-DBUILD_TESTS=OFF} \ - ../ -%{__make} - -%if %{with tests} -cd tests -LC_ALL=C.utf-8 VK_LAYER_PATH=../layers LD_LIBRARY_PATH=../loader:../layers ./run_all_tests.sh -cd .. -%endif - -%install -rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_datadir},%{_sysconfdir}}/vulkan/icd.d \ -$RPM_BUILD_ROOT{%{_datadir},%{_sysconfdir}}/vulkan/{explicit,implicit}_layer.d \ - $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/vulkan/layer} \ - $RPM_BUILD_ROOT%{_includedir}/vulkan \ - $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} - - -cd build -%{__make} install - -cp -p loader/libvulkan.so.1.0.3 $RPM_BUILD_ROOT%{_libdir} -ln -s libvulkan.so.1.0.3 $RPM_BUILD_ROOT%{_libdir}/libvulkan.so -ln -s libvulkan.so.1.0.3 $RPM_BUILD_ROOT%{_libdir}/libvulkan.so.1 - -cp -p demos/vulkaninfo $RPM_BUILD_ROOT%{_bindir}/vulkaninfo -cp -p demos/tri $RPM_BUILD_ROOT%{_bindir}/vulkan-tri -cp -p demos/cube $RPM_BUILD_ROOT%{_bindir}/vulkan-cube - -cp -p install_staging/*.so $RPM_BUILD_ROOT%{_libdir}/vulkan/layer -for f in layers/*.json ; do -sed -e's@"library_path": "./@"library_path": "%{_libdir}/vulkan/layer/@' $f > $RPM_BUILD_ROOT%{_datadir}/vulkan/explicit_layer.d/$(basename $f) -done - -cp -p libs/vkjson/libvkjson.a $RPM_BUILD_ROOT%{_libdir} -cp -p libs/vkjson/vkjson_{info,unittest} $RPM_BUILD_ROOT%{_bindir} - -cd .. - -cp -p libs/vkjson/vkjson.h $RPM_BUILD_ROOT%{_includedir} -cp -p include/vulkan/* $RPM_BUILD_ROOT%{_includedir}/vulkan - -cp -p demos/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -p /sbin/ldconfig -%postun-p /sbin/ldconfig - -%files -%defattr(644,root,root,755) -%doc LICENSE.txt -%doc loader/{README.md,LoaderAndLayerInterface.md} -%dir %{_sysconfdir}/vulkan -%dir %{_sysconfdir}/vulkan/icd.d -%dir %{_sysconfdir}/vulkan/explicit_layer.d -%dir %{_sysconfdir}/vulkan/implicit_layer.d -%dir %{_datadir}/vulkan -%dir %{_datadir}/vulkan/icd.d -%dir
[move command] packages/vulkan-loader -> packages/vulkan-sdk
___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit