January 2016 - openSUSE Commits - openSUSE Mailing Lists

commit xkeyboard-config for openSUSE:Factory
by root＠hilbert.suse.de 28 Jan '16

28 Jan '16

Hello community, here is the log from the commit of package xkeyboard-config for openSUSE:Factory checked in at 2016-01-28 17:19:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xkeyboard-config (Old) and /work/SRC/openSUSE:Factory/.xkeyboard-config.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xkeyboard-config" Changes: -------- --- /work/SRC/openSUSE:Factory/xkeyboard-config/xkeyboard-config.changes 2015-10-25 15:10:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xkeyboard-config.new/xkeyboard-config.changes 2016-01-28 17:19:12.000000000 +0100 @@ -1,0 +2,37 @@ +Wed Jan 27 10:34:40 UTC 2016 - sndirsch(a)suse.com + +- Update to version 2.16 + * Added sbj keymap for Jolla phone + * Adding the option to make Caps Lock act as a Menu key. + * add altwin:prtsc_rwin + * Add br(thinkpad) to the xml files + * symbols/group: re-enable grp:ctrls_toggle + * Make us(dvp) work with regular right Alt key again + * Updated Azerbaijani layout + * Azerty French Layout + * Added French Togo + * More changes to tg layout + * Added de(koy) + * syntax fix + * Translations updated before release + * Reenable layer5-lock for de variants + * Icelandic QWERTY Layout: Add ability to write Icelandic quotation marks („“) + +------------------------------------------------------------------- +Fri Jan 22 10:18:25 UTC 2016 - sndirsch(a)suse.com + +- add /usr/share/X11 dir to filelist in order to fix build again + +------------------------------------------------------------------- +Mon Dec 28 20:48:45 UTC 2015 - eich(a)suse.com + +- Adding 'BuildRequires: xsltproc' to build man page. + +------------------------------------------------------------------- +Mon Dec 28 20:31:19 UTC 2015 - eich(a)suse.com + +- Removed link from /usr/share/X11/xkb/xkbcomp to /usr/bin/xkbcomp +- Removed xkbcomp as Buildrequire (bnc#953161) +- Added man page xkeyboard-config (7) + +------------------------------------------------------------------- Old: ---- xkeyboard-config-2.16.tar.bz2 New: ---- xkeyboard-config-2.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkeyboard-config.spec ++++++ --- /var/tmp/diff_new_pack.BHrS5A/_old 2016-01-28 17:19:13.000000000 +0100 +++ /var/tmp/diff_new_pack.BHrS5A/_new 2016-01-28 17:19:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xkeyboard-config # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,13 +22,13 @@ BuildRequires: perl-XML-Parser BuildRequires: pkg-config BuildRequires: translation-update-upstream -BuildRequires: xkbcomp +BuildRequires: xsltproc BuildRequires: pkgconfig(xorg-macros) >= 1.12 Url: http://www.freedesktop.org/Software/XKeyboardConfig Provides: XFree86:/etc/X11/xkb/symbols/us Provides: xorg-x11:/etc/X11/xkb/symbols/us PreReq: /bin/ln /bin/rm -Version: 2.16 +Version: 2.17 Release: 0 Summary: The X Keyboard Extension License: GPL-2.0+ and LGPL-2.1+ and MIT and CDDL-1.0 @@ -68,7 +68,6 @@ %install make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/var/lib/xkb -ln -snf /usr/bin/xkbcomp $RPM_BUILD_ROOT/usr/share/X11/xkb/xkbcomp # Bug 335553 mkdir -p $RPM_BUILD_ROOT/var/lib/xkb/compiled/ ln -snf /var/lib/xkb/compiled/ $RPM_BUILD_ROOT/usr/share/X11/xkb/compiled @@ -86,8 +85,10 @@ %doc AUTHORS COPYING README docs/HOWTO.* docs/README.* %dir /var/lib/xkb %dir /var/lib/xkb/compiled +%dir /usr/share/X11 /usr/share/X11/xkb/ %{_datadir}/pkgconfig/*.pc +%{_mandir}/man7/* %files lang -f %{name}.lang ++++++ xkeyboard-config-2.16.tar.bz2 -> xkeyboard-config-2.17.tar.bz2 ++++++ ++++ 62033 lines of diff (skipped)

1 0

commit kinfocenter5 for openSUSE:Factory
by root＠hilbert.suse.de 28 Jan '16

28 Jan '16

Hello community, here is the log from the commit of package kinfocenter5 for openSUSE:Factory checked in at 2016-01-28 17:19:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kinfocenter5 (Old) and /work/SRC/openSUSE:Factory/.kinfocenter5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kinfocenter5" Changes: -------- --- /work/SRC/openSUSE:Factory/kinfocenter5/kinfocenter5.changes 2016-01-20 09:50:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kinfocenter5.new/kinfocenter5.changes 2016-01-28 17:19:07.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Jan 23 09:47:37 UTC 2016 - wbauer(a)tmo.at + +- Require baloo5-imports, this is needed for the + fileindexermonitor to work + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kinfocenter5.spec ++++++ --- /var/tmp/diff_new_pack.ApnWB7/_old 2016-01-28 17:19:08.000000000 +0100 +++ /var/tmp/diff_new_pack.ApnWB7/_new 2016-01-28 17:19:08.000000000 +0100 @@ -68,6 +68,8 @@ %if %{with lang} Recommends: %{name}-lang %endif +# needed for the fileindexermonitor +Requires: baloo5-imports BuildRoot: %{_tmppath}/%{name}-%{version}-build %description

1 0

commit libsrtp for openSUSE:Factory
by root＠hilbert.suse.de 28 Jan '16

28 Jan '16

Hello community, here is the log from the commit of package libsrtp for openSUSE:Factory checked in at 2016-01-28 17:18:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsrtp (Old) and /work/SRC/openSUSE:Factory/.libsrtp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libsrtp" Changes: -------- --- /work/SRC/openSUSE:Factory/libsrtp/libsrtp.changes 2015-08-10 09:12:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libsrtp.new/libsrtp.changes 2016-01-28 17:18:52.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 22 18:36:01 UTC 2016 - jengelh(a)inai.de + +- Update to new upstream release 1.5.3 +* Maintenance release, including fix for CVE-2015-6360. + +------------------------------------------------------------------- Old: ---- libsrtp-1.5.2.tar.gz New: ---- libsrtp-1.5.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsrtp.spec ++++++ --- /var/tmp/diff_new_pack.mL1P6F/_old 2016-01-28 17:18:53.000000000 +0100 +++ /var/tmp/diff_new_pack.mL1P6F/_new 2016-01-28 17:18:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libsrtp # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define soname 1 Name: libsrtp -Version: 1.5.2 +Version: 1.5.3 Release: 0 Summary: Secure Real-Time Transport Protocol (SRTP) library License: BSD-3-Clause @@ -31,7 +31,7 @@ BuildRequires: pkg-config BuildRequires: pkgconfig(openssl) Provides: srtp = %{version}-%{release} -Obsoletes: srtp < %{version} +Obsoletes: srtp < %{version}-%{release} %description The libSRTP library is an open source implementation of the Secure @@ -71,7 +71,6 @@ %prep %setup -q -sed -i 's/\r/\n/g' doc/draft-irtf-cfrg-icm-00.txt %build %configure \ ++++++ libsrtp-1.5.2.tar.gz -> libsrtp-1.5.3.tar.gz ++++++ ++++ 5043 lines of diff (skipped)

1 0

commit kfilemetadata5 for openSUSE:Factory
by root＠hilbert.suse.de 28 Jan '16

28 Jan '16

Hello community, here is the log from the commit of package kfilemetadata5 for openSUSE:Factory checked in at 2016-01-28 17:18:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfilemetadata5 (Old) and /work/SRC/openSUSE:Factory/.kfilemetadata5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kfilemetadata5" Changes: -------- --- /work/SRC/openSUSE:Factory/kfilemetadata5/kfilemetadata5.changes 2016-01-20 09:44:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kfilemetadata5.new/kfilemetadata5.changes 2016-01-28 17:18:48.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 11 11:09:29 UTC 2016 - wbauer(a)tmo.at + +- Build against poppler-qt5 on SLE12 and Leap 42 as well, it is + available meanwhile (boo#953957) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfilemetadata5.spec ++++++ --- /var/tmp/diff_new_pack.TzirCM/_old 2016-01-28 17:18:49.000000000 +0100 +++ /var/tmp/diff_new_pack.TzirCM/_new 2016-01-28 17:18:49.000000000 +0100 @@ -42,10 +42,7 @@ BuildRequires: taglib-devel >= 1.9 BuildRequires: cmake(Qt5Test) >= 5.4.0 BuildRequires: cmake(Qt5Xml) >= 5.4.0 -# No poppler-qt5 in Leap 42, do not build with it on 42 and SLE -%if "%{suse_version}" != "1315" || 0%{!?sle_version} BuildRequires: pkgconfig(poppler-qt5) -%endif Recommends: catdoc %if %{with lang} Recommends: %{name}-lang

1 0

commit grub2 for openSUSE:Factory
by root＠hilbert.suse.de 28 Jan '16

28 Jan '16

Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2016-01-28 17:18:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grub2" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2016-01-15 10:38:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2016-01-28 17:18:45.000000000 +0100 @@ -2 +2,12 @@ -Wed Mon 28 16:53:54 UTC 2015 - arvidjaar(a)gmail.com +Wed Jan 20 11:44:27 UTC 2016 - mchang(a)suse.com + +- Backport upstream patches for HyperV gen2 TSC timer calbration without + RTC (bsc#904647) + * added 0001-grub-core-kern-i386-tsc.c-calibrate_tsc-Ensure-that.patch + * added 0002-i386-tsc-Fix-unused-function-warning-on-xen.patch + * added 0003-acpi-do-not-skip-BIOS-scan-if-EBDA-length-is-zero.patch + * added 0004-tsc-Use-alternative-delay-sources-whenever-appropria.patch + * added 0005-i386-fix-TSC-calibration-using-PIT.patch + +------------------------------------------------------------------- +Wed Dec 28 16:53:54 UTC 2015 - arvidjaar(a)gmail.com New: ---- 0001-grub-core-kern-i386-tsc.c-calibrate_tsc-Ensure-that.patch 0002-i386-tsc-Fix-unused-function-warning-on-xen.patch 0003-acpi-do-not-skip-BIOS-scan-if-EBDA-length-is-zero.patch 0004-tsc-Use-alternative-delay-sources-whenever-appropria.patch 0005-i386-fix-TSC-calibration-using-PIT.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.rcY3Xn/_old 2016-01-28 17:18:47.000000000 +0100 +++ /var/tmp/diff_new_pack.rcY3Xn/_new 2016-01-28 17:18:47.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package grub2 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -263,6 +263,12 @@ Patch264: 0005-grub-fstest-fix-descriptor-leak.patch # Upstream patch to fix patch 0001-unix-password-Fix-file-descriptor-leak.patch Patch265: 0001-unix-do-not-close-stdin-in-grub_passwd_get.patch +# Backport upstream patches for HyperV gen2 TSC timer calbration without RTC (bsc#904647) +Patch270: 0001-grub-core-kern-i386-tsc.c-calibrate_tsc-Ensure-that.patch +Patch271: 0002-i386-tsc-Fix-unused-function-warning-on-xen.patch +Patch272: 0003-acpi-do-not-skip-BIOS-scan-if-EBDA-length-is-zero.patch +Patch273: 0004-tsc-Use-alternative-delay-sources-whenever-appropria.patch +Patch274: 0005-i386-fix-TSC-calibration-using-PIT.patch Requires: gettext-runtime %if 0%{?suse_version} >= 1140 @@ -535,6 +541,11 @@ %patch263 -p1 %patch264 -p1 %patch265 -p1 +%patch270 -p1 +%patch271 -p1 +%patch272 -p1 +%patch273 -p1 +%patch274 -p1 # Generate po/LINGUAS for message catalogs ... ./linguas.sh ++++++ 0001-grub-core-kern-i386-tsc.c-calibrate_tsc-Ensure-that.patch ++++++ >From 2e62352bc28bd5d3efafc1b5cbe211ff9e9987fd Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Tue, 20 Jan 2015 21:07:08 +0100 Subject: [PATCH] * grub-core/kern/i386/tsc.c (calibrate_tsc): Ensure that no division by 0 occurs. --- ChangeLog | 5 +++++ grub-core/kern/i386/tsc.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) Index: grub-2.02~beta2/grub-core/kern/i386/tsc.c =================================================================== --- grub-2.02~beta2.orig/grub-core/kern/i386/tsc.c +++ grub-2.02~beta2/grub-core/kern/i386/tsc.c @@ -122,7 +122,11 @@ calibrate_tsc (void) grub_pit_wait (0xffff); end_tsc = grub_get_tsc (); - grub_tsc_rate = grub_divmod64 ((55ULL << 32), end_tsc - tsc_boot_time, 0); + grub_tsc_rate = 0; + if (end_tsc > tsc_boot_time) + grub_tsc_rate = grub_divmod64 ((55ULL << 32), end_tsc - tsc_boot_time, 0); + if (grub_tsc_rate == 0) + grub_tsc_rate = 5368;/* 800 MHz */ } #endif ++++++ 0002-i386-tsc-Fix-unused-function-warning-on-xen.patch ++++++ >From 50ebc8f5f35a322b3736c03e16de7108932126b0 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Sun, 22 Feb 2015 13:12:44 +0100 Subject: [PATCH] i386/tsc: Fix unused function warning on xen. --- grub-core/kern/i386/tsc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: grub-2.02~beta2/grub-core/kern/i386/tsc.c =================================================================== --- grub-2.02~beta2.orig/grub-core/kern/i386/tsc.c +++ grub-2.02~beta2/grub-core/kern/i386/tsc.c @@ -57,6 +57,8 @@ grub_get_tsc (void) return (((grub_uint64_t) hi) << 32) | lo; } +#ifndef GRUB_MACHINE_XEN + static __inline int grub_cpu_is_tsc_supported (void) { @@ -69,8 +71,6 @@ grub_cpu_is_tsc_supported (void) return (d & (1 << 4)) != 0; } -#ifndef GRUB_MACHINE_XEN - static void grub_pit_wait (grub_uint16_t tics) { ++++++ 0003-acpi-do-not-skip-BIOS-scan-if-EBDA-length-is-zero.patch ++++++ >From 07258815e96aab2c72593d0129d17051cbf68d27 Mon Sep 17 00:00:00 2001 From: Andrei Borzenkov <arvidjaar(a)gmail.com> Date: Fri, 8 May 2015 06:15:16 +0300 Subject: [PATCH] acpi: do not skip BIOS scan if EBDA length is zero EBDA layout is not standardized so we cannot assume first two bytes are length. Neither is it required by ACPI standard. HP 8710W is known to contain zeroes here. Closes: 45002 --- grub-core/commands/acpi.c | 4 ++++ grub-core/commands/i386/pc/acpi.c | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) Index: grub-2.02~beta2/grub-core/commands/acpi.c =================================================================== --- grub-2.02~beta2.orig/grub-core/commands/acpi.c +++ grub-2.02~beta2/grub-core/commands/acpi.c @@ -179,8 +179,10 @@ grub_acpi_create_ebda (void) struct grub_acpi_rsdp_v20 *v2; ebda = (grub_uint8_t *) (grub_addr_t) ((*((grub_uint16_t *)0x40e)) << 4); + grub_dprintf ("acpi", "EBDA @%p\n", ebda); if (ebda) ebda_kb_len = *(grub_uint16_t *) ebda; + grub_dprintf ("acpi", "EBDA length 0x%x\n", ebda_kb_len); if (ebda_kb_len > 16) ebda_kb_len = 0; ctx.ebda_len = (ebda_kb_len + 1) << 10; @@ -494,6 +496,8 @@ grub_cmd_acpi (struct grub_extcmd_contex if (! rsdp) rsdp = grub_machine_acpi_get_rsdpv1 (); + grub_dprintf ("acpi", "RSDP @%p\n", rsdp); + if (rsdp) { grub_uint32_t *entry_ptr; Index: grub-2.02~beta2/grub-core/commands/i386/pc/acpi.c =================================================================== --- grub-2.02~beta2.orig/grub-core/commands/i386/pc/acpi.c +++ grub-2.02~beta2/grub-core/commands/i386/pc/acpi.c @@ -29,14 +29,15 @@ grub_machine_acpi_get_rsdpv1 (void) grub_dprintf ("acpi", "Looking for RSDP. Scanning EBDA\n"); ebda = (grub_uint8_t *) ((* ((grub_uint16_t *) 0x40e)) << 4); ebda_len = * (grub_uint16_t *) ebda; - if (! ebda_len) - return 0; + if (! ebda_len) /* FIXME do we really need this check? */ + goto scan_bios; for (ptr = ebda; ptr < ebda + 0x400; ptr += 16) if (grub_memcmp (ptr, GRUB_RSDP_SIGNATURE, GRUB_RSDP_SIGNATURE_SIZE) == 0 && grub_byte_checksum (ptr, sizeof (struct grub_acpi_rsdp_v10)) == 0 && ((struct grub_acpi_rsdp_v10 *) ptr)->revision == 0) return (struct grub_acpi_rsdp_v10 *) ptr; +scan_bios: grub_dprintf ("acpi", "Looking for RSDP. Scanning BIOS\n"); for (ptr = (grub_uint8_t *) 0xe0000; ptr < (grub_uint8_t *) 0x100000; ptr += 16) @@ -56,8 +57,8 @@ grub_machine_acpi_get_rsdpv2 (void) grub_dprintf ("acpi", "Looking for RSDP. Scanning EBDA\n"); ebda = (grub_uint8_t *) ((* ((grub_uint16_t *) 0x40e)) << 4); ebda_len = * (grub_uint16_t *) ebda; - if (! ebda_len) - return 0; + if (! ebda_len) /* FIXME do we really need this check? */ + goto scan_bios; for (ptr = ebda; ptr < ebda + 0x400; ptr += 16) if (grub_memcmp (ptr, GRUB_RSDP_SIGNATURE, GRUB_RSDP_SIGNATURE_SIZE) == 0 && grub_byte_checksum (ptr, sizeof (struct grub_acpi_rsdp_v10)) == 0 @@ -67,6 +68,7 @@ grub_machine_acpi_get_rsdpv2 (void) == 0) return (struct grub_acpi_rsdp_v20 *) ptr; +scan_bios: grub_dprintf ("acpi", "Looking for RSDP. Scanning BIOS\n"); for (ptr = (grub_uint8_t *) 0xe0000; ptr < (grub_uint8_t *) 0x100000; ptr += 16) ++++++ 0004-tsc-Use-alternative-delay-sources-whenever-appropria.patch ++++++ ++++ 1104 lines (skipped) ++++++ 0005-i386-fix-TSC-calibration-using-PIT.patch ++++++ >From a03c1034f6062e69075056c8f31b90e159ce5244 Mon Sep 17 00:00:00 2001 From: Michael Chang <mchang(a)suse.com> Date: Tue, 1 Dec 2015 18:49:38 +0300 Subject: [PATCH] i386: fix TSC calibration using PIT Condition was accidentally reversed, so PIT calibration always failed when PIT was present and always succeeded when PIT was missing, but in the latter case resulted in absurdly fast clock. Reported and tested by Vitaly Kuznetsov <vkuznets(a)redhat.com> --- grub-core/kern/i386/tsc_pit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: grub-2.02~beta2/grub-core/kern/i386/tsc_pit.c =================================================================== --- grub-2.02~beta2.orig/grub-core/kern/i386/tsc_pit.c +++ grub-2.02~beta2/grub-core/kern/i386/tsc_pit.c @@ -49,7 +49,7 @@ grub_pit_wait (void) | GRUB_PIT_SPK_TMR2, GRUB_PIT_SPEAKER_PORT); - if ((grub_inb (GRUB_PIT_SPEAKER_PORT) & GRUB_PIT_SPK_TMR2_LATCH)) { + if ((grub_inb (GRUB_PIT_SPEAKER_PORT) & GRUB_PIT_SPK_TMR2_LATCH) == 0x00) { ret = 1; /* Wait. */ while ((grub_inb (GRUB_PIT_SPEAKER_PORT) & GRUB_PIT_SPK_TMR2_LATCH) == 0x00);

1 0

commit opencv for openSUSE:Factory
by root＠hilbert.suse.de 28 Jan '16

28 Jan '16

Hello community, here is the log from the commit of package opencv for openSUSE:Factory checked in at 2016-01-28 17:18:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opencv (Old) and /work/SRC/openSUSE:Factory/.opencv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opencv" Changes: -------- --- /work/SRC/openSUSE:Factory/opencv/opencv-qt5.changes 2015-12-27 01:59:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.opencv.new/opencv-qt5.changes 2016-01-28 17:18:42.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 22 09:47:00 UTC 2016 - olaf(a)aepfle.de + +- Reduce build-compare noise + opencv-build-compare.patch + +------------------------------------------------------------------- opencv.changes: same change New: ---- opencv-build-compare.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opencv-qt5.spec ++++++ --- /var/tmp/diff_new_pack.zwCGUz/_old 2016-01-28 17:18:44.000000000 +0100 +++ /var/tmp/diff_new_pack.zwCGUz/_new 2016-01-28 17:18:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package opencv-qt5 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -44,6 +44,8 @@ Patch6: opencv-gcc5.patch # PATCH-FIX-UPSTREAM opencv-gles.patch -- support Qt5 built with GLES Patch7: opencv-gles.patch +# PATCH-FIX-OPENSUSE opencv-build-compare.patch -- avoid republish if some random external version number changes +Patch8: opencv-build-compare.patch BuildRequires: cmake BuildRequires: fdupes %if 0%{?suse_version} > 1310 @@ -157,6 +159,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 # Remove Windows specific files rm -f doc/packaging.txt ++++++ opencv.spec ++++++ --- /var/tmp/diff_new_pack.zwCGUz/_old 2016-01-28 17:18:44.000000000 +0100 +++ /var/tmp/diff_new_pack.zwCGUz/_new 2016-01-28 17:18:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package opencv # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,6 +40,8 @@ Patch5: opencv-altivec-vector.patch # PATCH-FIX-UPSTREAM opencv-gcc5.patch -- support gcc versions without minor version coolo(a)suse.de Patch6: opencv-gcc5.patch +# PATCH-FIX-OPENSUSE opencv-build-compare.patch -- avoid republish if some random external version number changes +Patch8: opencv-build-compare.patch BuildRequires: cmake BuildRequires: fdupes %if 0%{?suse_version} > 1310 @@ -143,6 +145,7 @@ #%patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch8 -p1 # Remove Windows specific files rm -f doc/packaging.txt ++++++ opencv-build-compare.patch ++++++ --- CMakeLists.txt | 4 ++-- cmake/OpenCVUtils.cmake | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) Index: opencv-2.4.11/CMakeLists.txt =================================================================== --- opencv-2.4.11.orig/CMakeLists.txt +++ opencv-2.4.11/CMakeLists.txt @@ -675,11 +675,11 @@ endif() # ========================== build platform ========================== status("") status(" Platform:") -status(" Host:" ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_VERSION} ${CMAKE_HOST_SYSTEM_PROCESSOR}) +status(" Host:" "Linux") if(CMAKE_CROSSCOMPILING) status(" Target:" ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_VERSION} ${CMAKE_SYSTEM_PROCESSOR}) endif() -status(" CMake:" ${CMAKE_VERSION}) +status(" CMake:" "YES") status(" CMake generator:" ${CMAKE_GENERATOR}) status(" CMake build tool:" ${CMAKE_BUILD_TOOL}) if(MSVC) Index: opencv-2.4.11/cmake/OpenCVUtils.cmake =================================================================== --- opencv-2.4.11.orig/cmake/OpenCVUtils.cmake +++ opencv-2.4.11/cmake/OpenCVUtils.cmake @@ -319,15 +319,18 @@ function(status text) if(${status_cond}) string(REPLACE ";" " " status_then "${status_then}") string(REGEX REPLACE "^[ \t]+" "" status_then "${status_then}") + string(REGEX REPLACE "\$ver [^\$]+\\)" "" status_then "${status_then}") ocv_output_status("${status_text} ${status_then}") else() string(REPLACE ";" " " status_else "${status_else}") string(REGEX REPLACE "^[ \t]+" "" status_else "${status_else}") + string(REGEX REPLACE "\$ver [^\$]+\\)" "" status_else "${status_else}") ocv_output_status("${status_text} ${status_else}") endif() else() string(REPLACE ";" " " status_cond "${status_cond}") string(REGEX REPLACE "^[ \t]+" "" status_cond "${status_cond}") + string(REGEX REPLACE "\$ver [^\$]+\\)" "" status_cond "${status_cond}") ocv_output_status("${status_text} ${status_cond}") endif() else()

1 0

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 28 Jan '16

28 Jan '16

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2016-01-28 17:18:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2016-01-05 09:40:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2016-01-28 17:18:34.000000000 +0100 @@ -1,0 +2,146 @@ +Thu Jan 14 12:53:29 CET 2016 - ms(a)suse.de + +- v7.03.49 released + +------------------------------------------------------------------- +Tue Jan 12 15:39:39 CET 2016 - ms(a)suse.de + +- Don't use filesystem specific mount option + + When mounting the read write filesystem, prevent using + filesystem specific options like barrier + +------------------------------------------------------------------- +Tue Jan 12 15:38:08 CET 2016 - ms(a)suse.de + +- Use HYBRID_EXT4_OPTS in fat container filesystem + +------------------------------------------------------------------- +Tue Jan 12 15:34:40 CET 2016 - ms(a)suse.de + +- Check read write filesystem prior to mounting + + If a filesystem type could be identified on the read write + partition check it before mounting to eliminate a potential + dirty state + +------------------------------------------------------------------- +Tue Jan 12 15:26:55 CET 2016 - ms(a)suse.de + +- Cascade exfat mount + + try normal mount first, if this does not work try fuse mount + Normally this is done automatically by the mount program but + if not we will give the direct fuse mount a chance + +------------------------------------------------------------------- +Mon Jan 11 19:11:12 CET 2016 - ms(a)suse.de + +- Make createFileSystem more robust + + When passing in a loop file instead of a device name, the method + should be smart enough to handle the name without shell evaluation + +------------------------------------------------------------------- +Mon Jan 11 16:38:32 CET 2016 - ms(a)suse.de + +- Compile rnc -> rng + +------------------------------------------------------------------- +Mon Jan 11 16:30:09 CET 2016 - ms(a)suse.de + +- Added support for exfat as hybrid filesystem + + In addition to fat also exfat is now supported as persistent + write filesystem. Because of the limitations of a fat filesystem + fat and exfat are only used as a container filesystem providing + an ext4 linux filesystem as a cowfile. The algorithm to create + the size of the cow file has also been changed to use half of + the size of the write partition or on fat a max size of 4G. + The size of the cowfile is also prepared to become overwritten. + However the XML definition and implementation to do this + is still missing + +------------------------------------------------------------------- +Mon Jan 11 16:08:17 CET 2016 - ms(a)suse.de + +- Reread partition table after hybrid setup + + The hybrid write partition is created via fdisk. Some version + of fdisk does not send the ioctl to let the kernel reread the + table or fdisk itself holds it busy. Thus we actively initiate + a reread via blockdev + +------------------------------------------------------------------- +Mon Jan 11 16:05:28 CET 2016 - ms(a)suse.de + +- Optimize ext4 hybrid write filesystem options + + Optimized for 512kB erase block size + +------------------------------------------------------------------- +Mon Jan 11 12:54:57 CET 2016 - ms(a)suse.de + +- Use mount options to increase overlay performace + + For overlay filesystems not writing into a tmpfs performance is + more important than safety. We use this combination of options + for now, if you encounter stability problems please let us know + +------------------------------------------------------------------- +Mon Jan 11 12:32:43 CET 2016 - ms(a)suse.de + +- Use -f force option for extX filesystem checker + +------------------------------------------------------------------- +Mon Jan 11 12:25:15 CET 2016 - ms(a)suse.de + +- Refactor and cleanup setupReadWrite + + Fix misleading error message and refactor the code to be less + complex and more clear in the processing of tasks + +------------------------------------------------------------------- +Mon Jan 11 11:38:59 CET 2016 - ms(a)suse.de + +- Allow custom cowfile name for persistent data + + Instead of a fixed name 'cowfile' we allow a custom name which is + predefined in HYBRID_PERSISTENT_FILENAME and prepared to become + overwritten by an XML defintion whose implementation will follow + later. Reason for the change is that a cowfile is visible as + plain data file to the operating system if e.g used on a live + stick. It should be more clear to the user what this file is + good for + +------------------------------------------------------------------- +Mon Jan 11 11:29:23 CET 2016 - ms(a)suse.de + +- Protect mkfs.exfat from being deleted + + Added to the strip tools section in order to keep it in the initrd + +------------------------------------------------------------------- +Mon Jan 11 11:26:23 CET 2016 - ms(a)suse.de + +- Added support for exfat creation and probing + + In preparation to use exfat instead of vfat in a loop container + for persistent data it's required to provide support for mkfs.exfat + +------------------------------------------------------------------- +Mon Jan 11 11:20:24 CET 2016 - ms(a)suse.de + +- Make loop_setup and loop_delete more robust + + The methods did not cope well with filenames containing bash + characters with special meaning e.g spaces. For use with a + iso hybrid cowfile whose name is visible in the OS the methods + should be able to work with any given filename + +------------------------------------------------------------------- +Sat Dec 26 13:55:55 CET 2015 - cyberorg(a)suse.de + +- fix message of missing command + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.oBtAOh/_old 2016-01-28 17:18:35.000000000 +0100 +++ /var/tmp/diff_new_pack.oBtAOh/_new 2016-01-28 17:18:35.000000000 +0100 @@ -27,7 +27,7 @@ Name: kiwi License: GPL-2.0 Group: System/Management -Version: 7.03.48 +Version: 7.03.49 Provides: kiwi-schema = 6.2 Provides: kiwi-image:aci Provides: kiwi-image:lxc ++++++ kiwi-docu.tar.bz2 ++++++ ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2015-12-17 09:28:28.000000000 +0100 +++ new/kiwi/.revision 2015-12-17 09:28:28.000000000 +0100 @@ -1 +1 @@ -e7ef2da84a78034424ae14ba4e6b2ebb14592dff +93052054fee85c16a6b1236a5d23144c77542f3a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/metadata/KIWIConfig.xml new/kiwi/metadata/KIWIConfig.xml --- old/kiwi/metadata/KIWIConfig.xml 2015-09-21 16:23:18.000000000 +0200 +++ new/kiwi/metadata/KIWIConfig.xml 2016-01-14 12:53:04.000000000 +0100 @@ -164,6 +164,7 @@ <file name="mkfs.ext4"/> <file name="mkfs.ntfs"/> <file name="mkfs.xfs"/> + <file name="mkfs.exfat"/> <file name="xfs_growfs"/> <file name="xfs_repair"/> <file name="xfs_admin"/> @@ -240,6 +241,7 @@ <file name="stat"/> <file name="swapoff"/> <file name="swapon"/> + <file name="systemd-detect-virt"/> <file name="tac"/> <file name="rev"/> <file name="tail"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2015-12-23 10:50:16.000000000 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2016-01-14 12:53:24.000000000 +0100 @@ -1933,7 +1933,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.03.48"; + $data{Version} = "7.03.49"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi"; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2015-12-23 10:50:16.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2016-01-14 12:50:28.000000000 +0100 @@ -23,6 +23,7 @@ export TRANSFER_ERRORS_FILE=/tmp/transfer.errors export UFONT=/usr/share/fbiterm/fonts/b16.pcf.gz export CONSOLE_FONT=/usr/share/kbd/consolefonts/default8x16.gz +export HYBRID_PERSISTENT_FILENAME="Live OS's persistent storage.fs" export HYBRID_PERSISTENT_FS=btrfs export HYBRID_PERSISTENT_ID=83 export HYBRID_PERSISTENT_DIR=/read-write @@ -41,6 +42,12 @@ } #====================================== +# Exports (hybrid filesystem options) +#-------------------------------------- +# Optimized for 512kB erase block size +export HYBRID_EXT4_OPTS="-b 4096 -O ^has_journal -E stride=128,stripe-width=128" + +#====================================== # Exports (console) #-------------------------------------- test -z "$ELOG_BOOTSHELL" && export ELOG_BOOTSHELL=/dev/tty2 @@ -3930,6 +3937,7 @@ xfs) FSTYPE=xfs ;; udf) FSTYPE=udf ;; zfs_member) FSTYPE=zfs ;; + exfat) FSTYPE=exfat ;; *) FSTYPE=unknown ;; @@ -4141,7 +4149,7 @@ #====================================== # Manual loading of modules #-------------------------------------- - for i in rd brd edd dm-mod xennet xenblk virtio_blk loop squashfs;do + for i in rd brd edd dm-mod xennet xenblk virtio_blk loop squashfs fuse;do modprobe $i &>/dev/null done udevPending @@ -6420,32 +6428,41 @@ # ---- local IFS=$IFS_ORIG local rwDir=/read-write - local rwDevice=`echo $UNIONFS_CONFIG | cut -d , -f 1` + local rwDevice=$(echo $UNIONFS_CONFIG | cut -d , -f 1) + local fstype=$(blkid $rwDevice -s TYPE -o value) + local hybrid_fs=$HYBRID_PERSISTENT_FS + local create_hybrid="no" + local fs_opts mkdir -p $rwDir - if [ $LOCAL_BOOT = "no" ] && [ $systemIntegrity = "clean" ];then - if [ "$RELOAD_IMAGE" = "yes" ] || \ - ! mount -o ro $rwDevice $rwDir &>/dev/null + if [ $hybrid_fs = "ext4" ];then + fs_opts="$HYBRID_EXT4_OPTS" + fi + if [ ! -z "$kiwi_hybridpersistent_filesystem" ];then + hybrid_fs=$kiwi_hybridpersistent_filesystem + fi + if [ $LOCAL_BOOT = "yes" ] || [ ! $systemIntegrity = "clean" ];then + # no further action on a standard boot/reboot or in unclean state + return 0 + fi + if [ ! -z "$fstype" ];then + Echo "Checking filesystem for RW data on $rwDevice..." + checkFilesystem $rwDevice &>/dev/null + fi + if [ "$RELOAD_IMAGE" = "yes" ]; then + # create rw fs explicitly activated + create_hybrid="yes" + elif ! mount -o ro $rwDevice $rwDir &>/dev/null; then + # still failing after check, trigger creation of new rw fs + create_hybrid="yes" + fi + mountpoint -q $rwDir && umount $rwDevice + if [ "$create_hybrid" = "yes" ];then + Echo "Creating filesystem for RW data on $rwDevice..." + if ! createFilesystem \ + "$rwDevice" "" "" "hybrid" "false" "$hybrid_fs" "$fs_opts" then - local hybrid_fs=$HYBRID_PERSISTENT_FS - if [ ! -z "$kiwi_hybridpersistent_filesystem" ];then - hybrid_fs=$kiwi_hybridpersistent_filesystem - fi - Echo "Checking filesystem for RW data on $rwDevice..." - checkFilesystem $rwDevice - - if [ "$RELOAD_IMAGE" = "yes" ] || \ - ! mount -o ro $rwDevice $rwDir &>/dev/null - then - Echo "Creating filesystem for RW data on $rwDevice..." - local exception_handling="false" - if ! createFilesystem $rwDevice "" "" "hybrid" $exception_handling $hybrid_fs; then - Echo "Failed to create ext3 filesystem" - return 1 - fi - checkFilesystem $rwDevice >/dev/null - fi - else - umount $rwDevice + Echo "Failed to create ${hybrid_fs} filesystem" + return 1 fi fi return 0 @@ -6519,6 +6536,7 @@ local roDevice=`echo $UNIONFS_CONFIG | cut -d , -f 2` local unionFST=`echo $UNIONFS_CONFIG | cut -d , -f 3` local prefix=/mnt + local mount_options #====================================== # load fuse module #-------------------------------------- @@ -6565,7 +6583,13 @@ if [ ! "$roDevice" = "nfs" ] && ! setupReadWrite; then return 1 fi - if ! kiwiMount "$rwDevice" "$rwDir";then + if [ "$kiwi_hybridpersistent" = "true" ];then + # When using an overlay writing to a block device safety has + # less priority over speed. If this does not match your use + # case please report an issue on the kiwi github + mount_options="-o defaults,async,relatime,nodiratime" + fi + if ! kiwiMount "$rwDevice" "$rwDir" "$mount_options";then Echo "Failed to mount read/write filesystem" return 1 fi @@ -9113,7 +9137,7 @@ local label=$(blkid $partd -s LABEL -o value) if [ "$label" = "hybrid" ];then Echo "Existing persistent hybrid partition found" - if [ $hybrid_fs = "fat" ];then + if [ "$hybrid_fs" = "fat" ] || [ "$hybrid_fs" = "exfat" ];then if ! setupHybridCowDevice;then Echo "Failed to setup hybrid cow device" Echo "Persistent writing deactivated" @@ -9165,6 +9189,7 @@ # based persistent write partitions to be created as first partition # on efi|uefi ISO hybrid images echo -e "n\np\n$pID\n\n\nw\nq" | fdisk $imageDiskDevice + blockdev --rereadpt $imageDiskDevice else createPartitionerInput \ n p:lxrw $pID . . t $pID $HYBRID_PERSISTENT_ID @@ -9189,9 +9214,12 @@ # create filesystem on write partition #-------------------------------------- local hybrid_device=$(ddn $device $pID) - local exception_handling="false" + local fs_opts + if [ "$hybrid_fs" = "ext4" ];then + fs_opts="$HYBRID_EXT4_OPTS" + fi if ! createFilesystem \ - $hybrid_device "" "" "hybrid" $exception_handling $hybrid_fs + $hybrid_device "" "" "hybrid" "false" "$hybrid_fs" "$fs_opts" then Echo "Failed to create hybrid persistent filesystem" Echo "Persistent writing deactivated" @@ -9201,7 +9229,7 @@ #====================================== # export read-write device name #-------------------------------------- - if [ $hybrid_fs = "fat" ];then + if [ "$hybrid_fs" = "fat" ] || [ "$hybrid_fs" = "exfat" ];then # The fat filesystem is not really suitable to be used as rootfs # for linux. Therefore we create a btrfs based file which we store # on the fat filesystem and loop setup it. The size of the file @@ -9228,25 +9256,41 @@ local hybrid_device=$1 mkdir -p /cow for i in 1 2 3;do - mount -L hybrid /cow && break || sleep 2 + if [ "$hybrid_fs" = "exfat" ]; then + mount $hybrid_device /cow ||\ + mount.exfat $hybrid_device /cow && break || sleep 2 + else + mount -L hybrid /cow && break || sleep 2 + fi done - if [ ! $? = 0 ];then + if ! mountpoint -q /cow; then Echo "Failed to mount hybrid persistent filesystem !" return 1 fi - if [ ! -e "/cow/cowfile" ];then - local cowsize=$(($(blockdev --getsize64 $hybrid_device) / 2)) - local exception_handling="false" - qemu-img create /cow/cowfile $cowsize + local hybrid_cow_filename="/cow/${HYBRID_PERSISTENT_FILENAME}" + if [ ! -z "$kiwi_hybridpersistent_cow_filename" ];then + hybrid_cow_filename="/cow/${kiwi_hybridpersistent_cow_filename}" + fi + if [ ! -e "$hybrid_cow_filename" ];then + # default cow filesize is half of partition's capacity + local cowsize="$(($(blockdev --getsize64 $hybrid_device) / 2))" + # but not for FAT due to the 4G file size limit + if [ "$hybrid_fs" = "fat" ] && [ "$cowsize" -gt 4294967295 ];then + cowsize=4294967295 + fi + if [ ! -z "$kiwi_hybridpersistent_filesize" ];then + cowsize=$kiwi_hybridpersistent_filesize + fi + qemu-img create "$hybrid_cow_filename" "$cowsize" if ! createFilesystem \ - "/cow/cowfile" "" "" "" $exception_handling "btrfs" + "$hybrid_cow_filename" "" "" "" "false" "ext4" "$HYBRID_EXT4_OPTS" then Echo "Failed to create hybrid persistent cow filesystem" return 1 fi fi - export HYBRID_RW=$(loop_setup /cow/cowfile) - if [ ! -e "$cowdevice" ];then + export HYBRID_RW=$(loop_setup "$hybrid_cow_filename") + if [ ! -e "$HYBRID_RW" ];then Echo "Failed to loop setup hybrid cow file !" return 1 fi @@ -9731,11 +9775,11 @@ if [ "$FSTYPE" = "reiserfs" ];then reiserfsck -y $device elif [ "$FSTYPE" = "ext2" ];then - e2fsck -p $device + e2fsck -p -f $device elif [ "$FSTYPE" = "ext3" ];then - e2fsck -p $device + e2fsck -p -f $device elif [ "$FSTYPE" = "ext4" ];then - e2fsck -p $device + e2fsck -p -f $device elif [ "$FSTYPE" = "btrfs" ];then btrfsck $device elif [ "$FSTYPE" = "xfs" ];then @@ -9910,33 +9954,39 @@ if [ ! -z "$label" ];then opts="$opts -L $label" fi + elif [ "$filesystem" = "exfat" ];then + if [ ! -z "$label" ];then + opts="$opts -n $label" + fi fi if [ "$filesystem" = "reiserfs" ];then - mkreiserfs $opts $deviceCreate $blocks 1>&2 + mkreiserfs $opts "$deviceCreate" $blocks 1>&2 elif [ "$filesystem" = "ext2" ];then - mkfs.ext2 $opts $deviceCreate $blocks 1>&2 + mkfs.ext2 $opts "$deviceCreate" $blocks 1>&2 elif [ "$filesystem" = "ext3" ];then - mkfs.ext3 $opts $deviceCreate $blocks 1>&2 + mkfs.ext3 $opts "$deviceCreate" $blocks 1>&2 elif [ "$filesystem" = "ext4" ];then - mkfs.ext4 $opts $deviceCreate $blocks 1>&2 + mkfs.ext4 $opts "$deviceCreate" $blocks 1>&2 elif [ "$filesystem" = "btrfs" ];then # delete potentially existing btrfs on the device because even # with the force option enabled mkfs.btrfs refuses to create a # filesystem if the existing metadata contains the same UUID - dd if=/dev/zero of=$deviceCreate bs=1M count=1 conv=notrunc - mkfs.btrfs $opts $deviceCreate + dd if=/dev/zero of="$deviceCreate" bs=1M count=1 conv=notrunc + mkfs.btrfs $opts "$deviceCreate" elif [ "$filesystem" = "xfs" ];then - mkfs.xfs $opts -f $deviceCreate + mkfs.xfs $opts -f "$deviceCreate" if [ ! -z "$uuid" ];then - xfs_admin -U $uuid $deviceCreate + xfs_admin -U $uuid "$deviceCreate" fi elif [ "$filesystem" = "fat" ];then - mkfs.fat $opts $deviceCreate $blocks 1>&2 + mkfs.fat $opts "$deviceCreate" $blocks 1>&2 elif [ "$filesystem" = "ntfs" ];then - mkfs.ntfs $opts $deviceCreate $blocks 1>&2 + mkfs.ntfs $opts "$deviceCreate" $blocks 1>&2 + elif [ "$filesystem" = "exfat" ];then + mkfs.exfat $opts "$deviceCreate" 1>&2 else # use ext3 by default - mkfs.ext3 $opts $deviceCreate $blocks 1>&2 + mkfs.ext3 $opts "$deviceCreate" $blocks 1>&2 fi if [ $exception_handling = "false" ];then return $? @@ -11384,12 +11434,12 @@ #-------------------------------------- function loop_setup { local IFS=$IFS_ORIG - local target=$1 + local target="$@" local logical_sector_size if [ ! -z "$kiwi_target_blocksize" ];then logical_sector_size="-L $kiwi_target_blocksize" fi - local loop=$(losetup $logical_sector_size -f --show $target) + local loop=$(losetup $logical_sector_size -f --show "$target") if [ ! -e "$loop" ];then return 1 fi @@ -11400,8 +11450,8 @@ #-------------------------------------- function loop_delete { local IFS=$IFS_ORIG - local target=$1 - losetup -d $target + local target="$@" + losetup -d "$target" } #====================================== # startMultipathd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rnc new/kiwi/modules/KIWISchema.rnc --- old/kiwi/modules/KIWISchema.rnc 2015-12-23 09:12:14.000000000 +0100 +++ new/kiwi/modules/KIWISchema.rnc 2016-01-14 12:50:28.000000000 +0100 @@ -1783,7 +1783,7 @@ ## hybrid ISO is used as disk on e.g a USB Stick. By default ## the btrfs filesystem is used attribute hybridpersistent_filesystem { - "btrfs" | "fat" | "ext4" | "xfs" + "btrfs" | "fat" | "exfat" | "ext4" | "xfs" } k.type.image.attribute = ## Specifies the image type diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rng new/kiwi/modules/KIWISchema.rng --- old/kiwi/modules/KIWISchema.rng 2015-12-23 09:12:14.000000000 +0100 +++ new/kiwi/modules/KIWISchema.rng 2016-01-14 12:50:28.000000000 +0100 @@ -2403,6 +2403,7 @@ <choice> <value>btrfs</value> <value>fat</value> + <value>exfat</value> <value>ext4</value> <value>xfs</value> </choice>

1 0

commit perl-Bootloader for openSUSE:Factory
by root＠hilbert.suse.de 28 Jan '16

28 Jan '16

Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at 2016-01-28 17:18:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old) and /work/SRC/openSUSE:Factory/.perl-Bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes 2016-01-15 10:40:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Bootloader.new/perl-Bootloader.changes 2016-01-28 17:18:30.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Jan 22 10:33:47 UTC 2016 - snwint(a)suse.com + +- fix typo +- Fix dtb searching +- 0.904 + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.903.tar.xz New: ---- perl-Bootloader-0.904.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.JMqggo/_old 2016-01-28 17:18:31.000000000 +0100 +++ /var/tmp/diff_new_pack.JMqggo/_new 2016-01-28 17:18:31.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Bootloader # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: perl-Bootloader -Version: 0.903 +Version: 0.904 Release: 0 Requires: coreutils Requires: perl-base = %{perl_version} ++++++ perl-Bootloader-0.903.tar.xz -> perl-Bootloader-0.904.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.903/VERSION new/perl-Bootloader-0.904/VERSION --- old/perl-Bootloader-0.903/VERSION 2015-12-18 16:28:52.000000000 +0100 +++ new/perl-Bootloader-0.904/VERSION 2016-01-22 11:32:44.000000000 +0100 @@ -1 +1 @@ -0.903 +0.904 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.903/changelog new/perl-Bootloader-0.904/changelog --- old/perl-Bootloader-0.903/changelog 2015-12-18 16:28:52.000000000 +0100 +++ new/perl-Bootloader-0.904/changelog 2016-01-22 11:32:44.000000000 +0100 @@ -1,3 +1,7 @@ +2016-01-22: 0.904 + - fix typo + - Fix dtb searching + 2015-12-18: 0.903 - improve add/del-option scripts - rename uboot to u-boot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.903/u-boot/config new/perl-Bootloader-0.904/u-boot/config --- old/perl-Bootloader-0.903/u-boot/config 2015-12-18 16:28:52.000000000 +0100 +++ new/perl-Bootloader-0.904/u-boot/config 2016-01-22 11:32:44.000000000 +0100 @@ -22,7 +22,7 @@ echo "# THIS FILE WILL BE OVERWRITTEN by perl-Bootloader" echo -n "# Last modification on " date - echo "# Please, use /boot/extlinux.d and /etc/default/uboot for configuration" + echo "# Please, use /boot/extlinux.d and /etc/default/u-boot for configuration" echo } @@ -62,6 +62,10 @@ entry_id=0 for ((i=0;i<${#zimage[@]};i++)) ; do + # dtb and kernel release may differ + basedtb=${dtb[$i]%-*} + basedtb=($(echo ${basedtb}-*)) + dtb[$i]=${basedtb[0]} if [ -r ${initrd[$i]} -a -r ${zimage[$i]} -a -d ${dtb[$i]} ] ; then for dtbfile in / $U_BOOT_DTB_LINUX_DEFAULT ; do print_entry linux_$((entry_id++)) ${zimage[$i]} ${initrd[$i]} "$U_BOOT_CMDLINE_LINUX_DEFAULT" ${dtb[$i]}'/'${dtbfile} >> $entry_file

1 0

commit pulseaudio for openSUSE:Factory
by root＠hilbert.suse.de 28 Jan '16

28 Jan '16

Hello community, here is the log from the commit of package pulseaudio for openSUSE:Factory checked in at 2016-01-28 17:18:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pulseaudio (Old) and /work/SRC/openSUSE:Factory/.pulseaudio.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pulseaudio" Changes: -------- --- /work/SRC/openSUSE:Factory/pulseaudio/pulseaudio.changes 2015-11-06 00:10:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pulseaudio.new/pulseaudio.changes 2016-01-28 17:18:23.000000000 +0100 @@ -1,0 +2,26 @@ +Fri Jan 22 08:43:14 UTC 2016 - oholecek(a)suse.com + +- Update to 8.0 + + Automatic routing more likely to change profile + + OS X and NetBSD support improvements + + Systemd journal logging for clients + + New LFE balance programming interface + + Module-dbus-protocol improvements + + More flexible configuration file handling + + pulsecore-8.0.so moved to a private directory + + New script for measuring memory consumption + + Various bug fixes and small improvements + + https://wiki.freedesktop.org/www/Software/PulseAudio/Notes/8.0/ + +------------------------------------------------------------------- +Tue Jan 12 16:15:24 UTC 2016 - oholecek(a)suse.com + +- Update to 8.0 RC2 (7.99.2) + +------------------------------------------------------------------- +Sun Jan 3 22:32:21 UTC 2016 - oholecek(a)suse.com + +- Update to 8.0 RC1 (7.99.1) +- remove 0004-module-alsa-card-Report-available-ports-before-unava.patch + +------------------------------------------------------------------- Old: ---- 0004-module-alsa-card-Report-available-ports-before-unava.patch pulseaudio-7.1.tar.xz New: ---- pulseaudio-8.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pulseaudio.spec ++++++ --- /var/tmp/diff_new_pack.WJPByr/_old 2016-01-28 17:18:25.000000000 +0100 +++ /var/tmp/diff_new_pack.WJPByr/_new 2016-01-28 17:18:25.000000000 +0100 @@ -16,7 +16,7 @@ # -%define drvver 7.1 +%define drvver 8.0 %define soname 0 %define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d %define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services @@ -27,7 +27,7 @@ %define _bluez5used 0%(echo "%{_bluezVersion}" | grep -q '^5' && echo 1) %define _bashcompletionsdir %{_datadir}/bash-completion/completions Name: pulseaudio -Version: 7.1 +Version: 8.0 Release: 0 Summary: A Networked Sound Server License: GPL-2.0+ and LGPL-2.1+ @@ -46,8 +46,6 @@ # PATCH-FIX-SUSE disable-srbchannel.patch boo#950487 Disable srbchannel as a workaround for crashes on KDE # XXX note this patch isn't used for now, kept just for workaround in future Patch3: disable-srbchannel.patch -# PATCH-FIX-UPSTREAM 0004-module-alsa-card-Report-available-ports-before-unava.patch boo#948979 -Patch104: 0004-module-alsa-card-Report-available-ports-before-unava.patch BuildRequires: alsa-devel >= 1.0.19 # require only minimal bluez, if we are on bluez 5 we will determine in build phase BuildRequires: bluez-devel >= 4.99 @@ -330,7 +328,6 @@ %if 0 %patch3 -p1 %endif -%patch104 -p1 %build echo 'HTML_TIMESTAMP=NO' >> doxygen/doxygen.conf.in @@ -391,6 +388,9 @@ mkdir -p %{buildroot}/%{_fwdefdir} install -m 0644 %{SOURCE4} %{buildroot}/%{_fwdefdir}/pulseaudio-server %endif +# create .d conf dirs (since 8.0) +mkdir -p %{buildroot}%{_sysconfdir}/pulse/client.conf.d +mkdir -p %{buildroot}%{_sysconfdir}/pulse/daemon.conf.d %fdupes doxygen/html %pre @@ -441,9 +441,9 @@ %dir %{_datadir}/pulseaudio %{_datadir}/pulseaudio/alsa-mixer %{_localstatedir}/adm/fillup-templates/sysconfig.sound-pulseaudio -%{_libdir}/libpulsecore-%{drvver}.so %dir %{_libdir}/pulseaudio %{_libdir}/pulseaudio/libpulsedsp.so +%{_libdir}/pulseaudio/libpulsecore-%{drvver}.so %dir %{_libdir}/pulse-%{drvver}/ %dir %{_libdir}/pulse-%{drvver}/modules/ %{_libdir}/pulse-%{drvver}/modules/libalsa-util.so @@ -533,6 +533,7 @@ %{_mandir}/man5/pulse-daemon.conf.5* %{_mandir}/man5/pulse-cli-syntax.5* %dir %{_sysconfdir}/pulse/ +%dir %{_sysconfdir}/pulse/daemon.conf.d %config(noreplace) %{_sysconfdir}/pulse/daemon.conf %config(noreplace) %{_sysconfdir}/pulse/default.pa %config(noreplace) %{_sysconfdir}/pulse/system.pa @@ -566,6 +567,7 @@ %defattr(-,root,root) %doc README LICENSE GPL LGPL %dir %{_sysconfdir}/pulse/ +%dir %{_sysconfdir}/pulse/client.conf.d %config(noreplace) %{_sysconfdir}/pulse/client.conf %{_libdir}/libpulse.so.%{soname} %{_libdir}/libpulse.so.%{soname}.* ++++++ pulseaudio-7.1.tar.xz -> pulseaudio-8.0.tar.xz ++++++ ++++ 10893 lines of diff (skipped)

1 0

commit xf86-video-r128 for openSUSE:Factory
by root＠hilbert.suse.de 28 Jan '16

28 Jan '16

Hello community, here is the log from the commit of package xf86-video-r128 for openSUSE:Factory checked in at 2016-01-28 17:18:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-r128 (Old) and /work/SRC/openSUSE:Factory/.xf86-video-r128.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-video-r128" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-r128/xf86-video-r128.changes 2015-05-06 07:48:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-r128.new/xf86-video-r128.changes 2016-01-28 17:18:18.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Jan 22 10:03:53 UTC 2016 - sndirsch(a)suse.com + +- Update to version 6.10.1 + * Really fix bitmasks for DDC + * Assume CRT in the absence of other monitors + +------------------------------------------------------------------- Old: ---- xf86-video-r128-6.10.0.tar.bz2 New: ---- xf86-video-r128-6.10.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-r128.spec ++++++ --- /var/tmp/diff_new_pack.ANSBzZ/_old 2016-01-28 17:18:19.000000000 +0100 +++ /var/tmp/diff_new_pack.ANSBzZ/_new 2016-01-28 17:18:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xf86-video-r128 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xf86-video-r128 -Version: 6.10.0 +Version: 6.10.1 Release: 0 Summary: ATI Rage 128 video driver for the Xorg X server License: MIT ++++++ xf86-video-r128-6.10.0.tar.bz2 -> xf86-video-r128-6.10.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-r128-6.10.0/ChangeLog new/xf86-video-r128-6.10.1/ChangeLog --- old/xf86-video-r128-6.10.0/ChangeLog 2015-05-02 02:38:14.000000000 +0200 +++ new/xf86-video-r128-6.10.1/ChangeLog 2016-01-22 04:45:44.000000000 +0100 @@ -1,3 +1,41 @@ +commit d3f3c9549119629ddd9447a0f9b699a909b916d5 +Author: Connor Behan <connor.behan(a)gmail.com> +Date: Thu Jan 21 22:12:25 2016 -0500 + + Bump to version 6.10.1 + + Signed-off-by: Connor Behan <connor.behan(a)gmail.com> + Tested-by: Christopher Chavez <chrischavez(a)gmx.us> + +commit 562681414f38c6925da01b3fec0802f532cd9e53 +Author: Connor Behan <connor.behan(a)gmail.com> +Date: Sun Jan 17 16:45:31 2016 -0500 + + Assume CRT in the absence of other monitors + + This patch is still untested, but it sounds like a lot of people need + it. Assuming that there are no monitors when DDC fails (which causes X + to abort with UMS) does not make sense. Some people will always have DDC + fail. For example, the pins are not connected on an iMac G3. For another + example, some RAGE128TF cards are known to lie that there is no VGA port + in the connector table. + + Signed-off-by: Connor Behan <connor.behan(a)gmail.com> + +commit d6dd6c9ad5ba8e4950c9398d93298fea48745263 +Author: Connor Behan <connor.behan(a)gmail.com> +Date: Thu Jul 2 18:20:58 2015 -0400 + + Really fix bitmasks for DDC + + For DDC, there is actually no difference between Pro2 cards and other + VGA desktop cards. Mobility / dualhead cards are the only ones that + differ. + Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=91113 + + Signed-off-by: Connor Behan <connor.behan(a)gmail.com> + Tested-by: Kevin Brace <kevinbrace(a)gmx.com> + commit 0b0f74ac7db42c772c8dda0167154bbdcb904d4f Author: Connor Behan <connor.behan(a)gmail.com> Date: Fri May 1 19:43:42 2015 -0400 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-r128-6.10.0/aclocal.m4 new/xf86-video-r128-6.10.1/aclocal.m4 --- old/xf86-video-r128-6.10.0/aclocal.m4 2015-05-02 02:31:33.000000000 +0200 +++ new/xf86-video-r128-6.10.1/aclocal.m4 2016-01-22 04:21:01.000000000 +0100 @@ -9049,32 +9049,63 @@ m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant <scott(a)netsplit.com>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29) +dnl +dnl Copyright © 2004 Scott James Remnant <scott(a)netsplit.com>. +dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists(a)gmail.com> +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) @@ -9096,18 +9127,19 @@ PKG_CONFIG="" fi fi[]dnl -])# PKG_PROG_PKG_CONFIG +])dnl PKG_PROG_PKG_CONFIG -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ @@ -9117,8 +9149,10 @@ $3])dnl fi]) -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. m4_define([_PKG_CONFIG], [if test -n "$$1"; then pkg_cv_[]$1="$$1" @@ -9130,10 +9164,11 @@ else pkg_failed=untried fi[]dnl -])# _PKG_CONFIG +])dnl _PKG_CONFIG -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -9141,19 +9176,17 @@ else _pkg_short_errors_supported=no fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +])dnl _PKG_SHORT_ERRORS_SUPPORTED -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac AC_DEFUN([PKG_CHECK_MODULES], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl @@ -9207,16 +9240,40 @@ AC_MSG_RESULT([yes]) $3 fi[]dnl -])# PKG_CHECK_MODULES +])dnl PKG_CHECK_MODULES + + +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. AC_DEFUN([PKG_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -9227,16 +9284,18 @@ AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR +])dnl PKG_INSTALLDIR -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. AC_DEFUN([PKG_NOARCH_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -9247,13 +9306,15 @@ AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR +])dnl PKG_NOARCH_INSTALLDIR -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. AC_DEFUN([PKG_CHECK_VAR], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl @@ -9262,7 +9323,7 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR +])dnl PKG_CHECK_VAR dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. dnl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-r128-6.10.0/configure new/xf86-video-r128-6.10.1/configure --- old/xf86-video-r128-6.10.0/configure 2015-05-02 02:31:39.000000000 +0200 +++ new/xf86-video-r128-6.10.1/configure 2016-01-22 04:21:04.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xf86-video-r128 6.10.0. +# Generated by GNU Autoconf 2.69 for xf86-video-r128 6.10.1. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='xf86-video-r128' PACKAGE_TARNAME='xf86-video-r128' -PACKAGE_VERSION='6.10.0' -PACKAGE_STRING='xf86-video-r128 6.10.0' +PACKAGE_VERSION='6.10.1' +PACKAGE_STRING='xf86-video-r128 6.10.1' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -1377,7 +1377,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xf86-video-r128 6.10.0 to adapt to many kinds of systems. +\`configure' configures xf86-video-r128 6.10.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1447,7 +1447,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-video-r128 6.10.0:";; + short | recursive ) echo "Configuration of xf86-video-r128 6.10.1:";; esac cat <<\_ACEOF @@ -1588,7 +1588,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-video-r128 configure 6.10.0 +xf86-video-r128 configure 6.10.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2003,7 +2003,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-video-r128 $as_me 6.10.0, which was +It was created by xf86-video-r128 $as_me 6.10.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2871,7 +2871,7 @@ # Define the identity of the package. PACKAGE='xf86-video-r128' - VERSION='6.10.0' + VERSION='6.10.1' cat >>confdefs.h <<_ACEOF @@ -20021,7 +20021,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xf86-video-r128 $as_me 6.10.0, which was +This file was extended by xf86-video-r128 $as_me 6.10.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20087,7 +20087,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xf86-video-r128 config.status 6.10.0 +xf86-video-r128 config.status 6.10.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-r128-6.10.0/configure.ac new/xf86-video-r128-6.10.1/configure.ac --- old/xf86-video-r128-6.10.0/configure.ac 2015-05-02 01:43:36.000000000 +0200 +++ new/xf86-video-r128-6.10.1/configure.ac 2016-01-22 04:11:55.000000000 +0100 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-r128], - [6.10.0], + [6.10.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-r128]) AC_CONFIG_SRCDIR([Makefile.am]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-r128-6.10.0/src/r128_output.c new/xf86-video-r128-6.10.1/src/r128_output.c --- old/xf86-video-r128-6.10.0/src/r128_output.c 2015-03-24 02:56:52.000000000 +0100 +++ new/xf86-video-r128-6.10.1/src/r128_output.c 2016-01-17 22:44:52.000000000 +0100 @@ -230,18 +230,19 @@ { ScrnInfoPtr pScrn = output->scrn; R128InfoPtr info = R128PTR(pScrn); + R128EntPtr pR128Ent = R128EntPriv(pScrn); unsigned char *R128MMIO = info->MMIO; R128OutputPrivatePtr r128_output = output->driver_private; - R128MonitorType MonType = MT_NONE; + R128MonitorType MonType = MT_CRT; xf86MonPtr *MonInfo = &output->MonInfo; uint32_t mask1, mask2; if (r128_output->type == OUTPUT_LVDS) { return MT_LCD; } else if (r128_output->type == OUTPUT_VGA) { - mask1 = R128_GPIO_MONID_MASK_1 | (info->isPro2 ? R128_GPIO_MONID_MASK_2 : R128_GPIO_MONID_MASK_3); - mask2 = R128_GPIO_MONID_A_1 | (info->isPro2 ? R128_GPIO_MONID_A_2 : R128_GPIO_MONID_A_3); + mask1 = R128_GPIO_MONID_MASK_1 | (pR128Ent->HasCRTC2 ? R128_GPIO_MONID_MASK_3 : R128_GPIO_MONID_MASK_2); + mask2 = R128_GPIO_MONID_A_1 | (pR128Ent->HasCRTC2 ? R128_GPIO_MONID_A_3 : R128_GPIO_MONID_A_2); } else { mask1 = R128_GPIO_MONID_MASK_0 | R128_GPIO_MONID_MASK_3; mask2 = R128_GPIO_MONID_A_0 | R128_GPIO_MONID_A_3; @@ -268,9 +269,6 @@ else MonType = MT_CRT; } - } else if (xf86I2CProbeAddress(r128_output->pI2CBus, 0x0060)) { - /* Just in case. */ - MonType = MT_CRT; } return MonType; @@ -477,7 +475,7 @@ if (otypes[i] != OUTPUT_LVDS && info->DDC) { i2c.ddc_reg = R128_GPIO_MONID; - if (otypes[i] == OUTPUT_VGA && info->isPro2) { + if (otypes[i] == OUTPUT_VGA && !pR128Ent->HasCRTC2) { i2c.put_clk_mask = R128_GPIO_MONID_EN_2; i2c.get_clk_mask = R128_GPIO_MONID_Y_2; } else {

1 0