September 2015 - openSUSE Commits - openSUSE Mailing Lists

commit audacity for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '15

27 Sep '15

Hello community, here is the log from the commit of package audacity for openSUSE:Factory checked in at 2015-09-27 08:40:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audacity (Old) and /work/SRC/openSUSE:Factory/.audacity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "audacity" Changes: -------- --- /work/SRC/openSUSE:Factory/audacity/audacity.changes 2015-07-21 13:29:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.audacity.new/audacity.changes 2015-09-27 08:39:27.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 22 08:47:31 UTC 2015 - olaf(a)aepfle.de + +- Use pkgconfig for ffmpeg BuildRequires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacity.spec ++++++ --- /var/tmp/diff_new_pack.NTVrI4/_old 2015-09-27 08:39:28.000000000 +0200 +++ /var/tmp/diff_new_pack.NTVrI4/_new 2015-09-27 08:39:28.000000000 +0200 @@ -71,7 +71,9 @@ Recommends: libavutil Recommends: libmp3lame0 %if %{with ffmpeg} -BuildRequires: libffmpeg-devel +BuildRequires: pkgconfig(libavcodec) >= 51.53 +BuildRequires: pkgconfig(libavformat) >= 52.12 +BuildRequires: pkgconfig(libavutil) %endif %if %{with mad} BuildRequires: pkgconfig(mad)

1 0

commit youtube-dl for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '15

27 Sep '15

Hello community, here is the log from the commit of package youtube-dl for openSUSE:Factory checked in at 2015-09-27 08:40:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/youtube-dl (Old) and /work/SRC/openSUSE:Factory/.youtube-dl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "youtube-dl" Changes: -------- --- /work/SRC/openSUSE:Factory/youtube-dl/youtube-dl.changes 2015-09-17 09:21:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.youtube-dl.new/youtube-dl.changes 2015-09-27 08:39:26.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Sep 24 10:34:02 UTC 2015 - jengelh(a)inai.de + +- Update to new upstream release 2015.09.22 +* nowness: video extraction and add support serie and playlist ext?. +* ndr: add support for embeds +* yahoo: process query result embedded in webpage + +------------------------------------------------------------------- Old: ---- youtube-dl-2015.09.03.tar.gz youtube-dl-2015.09.03.tar.gz.sig New: ---- youtube-dl-2015.09.22.tar.gz youtube-dl-2015.09.22.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ youtube-dl.spec ++++++ --- /var/tmp/diff_new_pack.nJRAwW/_old 2015-09-27 08:39:26.000000000 +0200 +++ /var/tmp/diff_new_pack.nJRAwW/_new 2015-09-27 08:39:26.000000000 +0200 @@ -17,7 +17,7 @@ Name: youtube-dl -Version: 2015.09.03 +Version: 2015.09.22 Release: 0 Summary: A tool for downloading from Youtube License: SUSE-Public-Domain and CC-BY-SA-3.0 ++++++ youtube-dl-2015.09.03.tar.gz -> youtube-dl-2015.09.22.tar.gz ++++++ ++++ 4058 lines of diff (skipped)

1 0

commit goobox for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '15

27 Sep '15

Hello community, here is the log from the commit of package goobox for openSUSE:Factory checked in at 2015-09-27 08:40:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/goobox (Old) and /work/SRC/openSUSE:Factory/.goobox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "goobox" Changes: -------- --- /work/SRC/openSUSE:Factory/goobox/goobox.changes 2015-04-16 14:13:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.goobox.new/goobox.changes 2015-09-27 08:39:24.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Sep 23 17:55:38 UTC 2015 - zaitor(a)opensuse.org + +- Update to version 3.4.1: + + Command line arguments not handled correctly. + + Fix possible crash. + + Updated translations. + +------------------------------------------------------------------- Old: ---- goobox-3.4.0.tar.xz New: ---- goobox-3.4.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ goobox.spec ++++++ --- /var/tmp/diff_new_pack.mLnGr9/_old 2015-09-27 08:39:25.000000000 +0200 +++ /var/tmp/diff_new_pack.mLnGr9/_new 2015-09-27 08:39:25.000000000 +0200 @@ -17,7 +17,7 @@ Name: goobox -Version: 3.4.0 +Version: 3.4.1 Release: 0 # FIXME: Enable libcoverart support. Summary: CD Player and Ripper for GNOME ++++++ goobox-3.4.0.tar.xz -> goobox-3.4.1.tar.xz ++++++ ++++ 2417 lines of diff (skipped)

1 0

commit mkvtoolnix for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '15

27 Sep '15

Hello community, here is the log from the commit of package mkvtoolnix for openSUSE:Factory checked in at 2015-09-27 08:39:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkvtoolnix (Old) and /work/SRC/openSUSE:Factory/.mkvtoolnix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mkvtoolnix" Changes: -------- --- /work/SRC/openSUSE:Factory/mkvtoolnix/mkvtoolnix.changes 2015-09-24 06:16:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mkvtoolnix.new/mkvtoolnix.changes 2015-09-27 08:39:20.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Sep 22 13:56:09 UTC 2015 - rpm(a)fthiessen.de + +- Updated to version 8.4.0: +* MMG has been removed. +* Dropped wxWidgets dependencies (new gui uses QT). +* A lot of bugfixes and enhancements of the gui and mkvmerge + (see https://bunkus.org/videotools/mkvtoolnix/doc/ChangeLog) +* mkvmerge: bug fix: calculating of delay for audio garbage data + got fixed. +* all: bug fix: parsing of strings containing negative values or + timecodes was broken on 32-but architectures. +* mkvmerge: bug fix: number of channels and the sample rate + reported for DTS in MPEG streams was 0. + +------------------------------------------------------------------- Old: ---- mkvtoolnix-8.3.0.tar.xz New: ---- mkvtoolnix-8.4.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkvtoolnix.spec ++++++ --- /var/tmp/diff_new_pack.KtXxzJ/_old 2015-09-27 08:39:21.000000000 +0200 +++ /var/tmp/diff_new_pack.KtXxzJ/_new 2015-09-27 08:39:21.000000000 +0200 @@ -17,7 +17,7 @@ Name: mkvtoolnix -Version: 8.3.0 +Version: 8.4.0 Release: 0 Summary: Tools to Create, Alter, and Inspect Matroska Files License: GPL-2.0+ @@ -31,10 +31,10 @@ BuildRequires: fdupes BuildRequires: file-devel BuildRequires: gcc-c++ >= 4.7 -BuildRequires: lzo-devel +BuildRequires: gettext-tools +BuildRequires: libqt5-qtbase-devel >= 5.2.0 BuildRequires: ruby >= 1.9 BuildRequires: xz -BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libebml) >= 1.3.1 @@ -47,11 +47,6 @@ # Needed because of scriplets macros BuildRequires: desktop-file-utils BuildRequires: shared-mime-info -%if 0%{?suse_version} >= 1320 -BuildRequires: wxWidgets-devel >= 3 -%else -BuildRequires: wxWidgets-devel >= 2.8 -%endif %description Tools to create and manipulate Matroska files (extensions .mkv and .mka), a new @@ -62,13 +57,13 @@ %setup -q %build -%configure --without-build-timestamp --docdir=%{_docdir}/%{name} --with-boost-libdir=%{_libdir} -./drake %{?_smp_mflags} V=1 +export CFLAGS="$RPM_OPT_FLAGS" +export CXXFLAGS="$RPM_OPT_FLAGS" +%configure --docdir=%{_docdir}/%{name} +./drake %{?_smp_mflags} %install ./drake install DESTDIR=%{buildroot} -install -pm 0644 AUTHORS ChangeLog COPYING README.md %{buildroot}%{_docdir}/%{name} -cp -a examples %{buildroot}%{_docdir}/%{name} # I guess this is the correct thing to do until bnc#737549 is fixed rm -rf %{buildroot}%{_mandir}/nl %{buildroot}%{_mandir}/uk %{buildroot}%{_mandir}/zh_CN %find_lang %{name} --with-man --all-name @@ -86,14 +81,15 @@ %files -f %{name}.lang %defattr(-,root,root) -%{_docdir}/%{name} +%doc AUTHORS ChangeLog COPYING README.md +%doc examples %{_bindir}/mkvextract %{_bindir}/mkvinfo %{_bindir}/mkvmerge -%{_bindir}/mmg %{_bindir}/mkvpropedit +%{_bindir}/mkvtoolnix-gui %{_datadir}/applications/mkvinfo.desktop -%{_datadir}/applications/mkvmergeGUI.desktop +%{_datadir}/applications/mkvtoolnix-gui.desktop %{_datadir}/icons/hicolor/*/apps/mkvextract.png %{_datadir}/icons/hicolor/*/apps/mkvinfo.png %{_datadir}/icons/hicolor/*/apps/mkvmerge.png @@ -103,7 +99,7 @@ %{_mandir}/man1/mkvextract.1%{ext_man} %{_mandir}/man1/mkvinfo.1%{ext_man} %{_mandir}/man1/mkvmerge.1%{ext_man} -%{_mandir}/man1/mmg.1%{ext_man} %{_mandir}/man1/mkvpropedit.1%{ext_man} +%{_mandir}/man1/mkvtoolnix-gui.1%{ext_man} %changelog ++++++ mkvtoolnix-8.3.0.tar.xz -> mkvtoolnix-8.4.0.tar.xz ++++++ ++++ 314947 lines of diff (skipped)

1 0

commit xf86-video-ast for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '15

27 Sep '15

Hello community, here is the log from the commit of package xf86-video-ast for openSUSE:Factory checked in at 2015-09-27 08:39:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-ast (Old) and /work/SRC/openSUSE:Factory/.xf86-video-ast.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-video-ast" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-ast/xf86-video-ast.changes 2014-09-03 21:19:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-ast.new/xf86-video-ast.changes 2015-09-27 08:39:19.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Sep 14 20:30:27 UTC 2015 - zaitor(a)opensuse.org + +- Update to version 1.1.5: + + Support AST2500. + + Fixed Failed to Init when ASPEED Graphics is Secondary. + + Fixed Transient Noise While System Resume from Hibernate. + + Use same search mode criteria with ast drm driver. + + Use proper type. + +------------------------------------------------------------------- Old: ---- xf86-video-ast-1.0.1.tar.bz2 New: ---- xf86-video-ast-1.1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-ast.spec ++++++ --- /var/tmp/diff_new_pack.YiFTNr/_old 2015-09-27 08:39:19.000000000 +0200 +++ /var/tmp/diff_new_pack.YiFTNr/_new 2015-09-27 08:39:19.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xf86-video-ast # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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-ast -Version: 1.0.1 +Version: 1.1.5 Release: 0 Summary: ASpeed Technologies video driver for the Xorg X server License: MIT ++++++ xf86-video-ast-1.0.1.tar.bz2 -> xf86-video-ast-1.1.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-ast-1.0.1/ChangeLog new/xf86-video-ast-1.1.5/ChangeLog --- old/xf86-video-ast-1.0.1/ChangeLog 2014-08-11 05:46:39.000000000 +0200 +++ new/xf86-video-ast-1.1.5/ChangeLog 2015-08-19 03:36:24.000000000 +0200 @@ -1,3 +1,44 @@ +commit 39e80895acb4b818ecc15af51a68178562ebb41d +Author: Y.C. Chen <yc_chen(a)aspeedtech.com> +Date: Wed Aug 19 09:21:05 2015 +0800 + + Bump Version to 1.1.5 + +commit 74281c4ce201ff04a6672c703d09ed28286f1801 +Author: Y.C. Chen <yc_chen(a)aspeedtech.com> +Date: Fri Aug 14 15:30:00 2015 +0800 + + Support AST2500 + +commit 9918d6f69ac51d9d27b074e3e490783acda68dca +Author: Y.C. Chen <yc_chen(a)aspeedtech.com> +Date: Fri Aug 14 10:11:23 2015 +0800 + + Fixed Failed to Init when ASPEED Graphics is Secondary + +commit e545ab905ea120014558d6f1733d87ffde5d5d71 +Author: Y.C. Chen <yc_chen(a)aspeedtech.com> +Date: Thu Aug 13 15:54:15 2015 +0800 + + Fixed Transient Noise While System Resume from Hibernate + +commit 77e7ac37c6031551f7ad355dc94c4176df4956aa +Author: Y.C. Chen <yc_chen(a)aspeedtech.com> +Date: Thu Aug 13 15:21:57 2015 +0800 + + use same search mode criteria with ast drm driver + +commit 4f404aa29eea5707cfdfe3dc2c762bd46063dfec +Author: Thomas Klausner <wiz(a)NetBSD.org> +Date: Mon Aug 18 05:35:48 2014 +0800 + + Use proper type. + + Two other places in this file already use uint32_t when passing + it to PCI_READ_LONG. + + Signed-off-by: Thomas Klausner <wiz(a)NetBSD.org> + commit d531cac475980908ea52309846221a974b8e7efd Author: Y.C. Chen <yc_chen(a)aspeedtech.com> Date: Fri Aug 8 16:51:07 2014 +0800 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-ast-1.0.1/configure new/xf86-video-ast-1.1.5/configure --- old/xf86-video-ast-1.0.1/configure 2014-08-08 11:01:06.000000000 +0200 +++ new/xf86-video-ast-1.1.5/configure 2015-08-19 03:26:42.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xf86-video-ast 1.0.1. +# Generated by GNU Autoconf 2.69 for xf86-video-ast 1.1.5. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='xf86-video-ast' PACKAGE_TARNAME='xf86-video-ast' -PACKAGE_VERSION='1.0.1' -PACKAGE_STRING='xf86-video-ast 1.0.1' +PACKAGE_VERSION='1.1.5' +PACKAGE_STRING='xf86-video-ast 1.1.5' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -1358,7 +1358,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-ast 1.0.1 to adapt to many kinds of systems. +\`configure' configures xf86-video-ast 1.1.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1428,7 +1428,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-video-ast 1.0.1:";; + short | recursive ) echo "Configuration of xf86-video-ast 1.1.5:";; esac cat <<\_ACEOF @@ -1558,7 +1558,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-video-ast configure 1.0.1 +xf86-video-ast configure 1.1.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1973,7 +1973,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-ast $as_me 1.0.1, which was +It was created by xf86-video-ast $as_me 1.1.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2841,7 +2841,7 @@ # Define the identity of the package. PACKAGE='xf86-video-ast' - VERSION='1.0.1' + VERSION='1.1.5' cat >>confdefs.h <<_ACEOF @@ -18824,7 +18824,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-ast $as_me 1.0.1, which was +This file was extended by xf86-video-ast $as_me 1.1.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18890,7 +18890,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-ast config.status 1.0.1 +xf86-video-ast config.status 1.1.5 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-ast-1.0.1/configure.ac new/xf86-video-ast-1.1.5/configure.ac --- old/xf86-video-ast-1.0.1/configure.ac 2014-08-08 10:59:04.000000000 +0200 +++ new/xf86-video-ast-1.1.5/configure.ac 2015-08-19 03:24:48.000000000 +0200 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-ast], - [1.0.1], + [1.1.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xf86-video-ast]) AC_CONFIG_SRCDIR([Makefile.am]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-ast-1.0.1/src/ast.h new/xf86-video-ast-1.1.5/src/ast.h --- old/xf86-video-ast-1.0.1/src/ast.h 2014-08-08 10:59:04.000000000 +0200 +++ new/xf86-video-ast-1.1.5/src/ast.h 2015-08-19 03:24:48.000000000 +0200 @@ -72,6 +72,7 @@ AST2150, AST2300, AST2400, + AST2500, AST1180 } CHIP_ID; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-ast-1.0.1/src/ast_2dtool.c new/xf86-video-ast-1.1.5/src/ast_2dtool.c --- old/xf86-video-ast-1.0.1/src/ast_2dtool.c 2014-08-08 10:59:04.000000000 +0200 +++ new/xf86-video-ast-1.1.5/src/ast_2dtool.c 2015-08-19 03:24:48.000000000 +0200 @@ -241,7 +241,7 @@ ULONG ulData; PFN_bENABLE_CMDQ pfnEnableCMDQ = bEnableCMDQ; - if ( (pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) ) + if ( (pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) || (pAST->jChipType == AST2500) ) pfnEnableCMDQ = bEnableCMDQ2300; switch (pAST->jChipType) @@ -252,6 +252,7 @@ case AST2150: case AST2300: case AST2400: + case AST2500: *(ULONG *) (pAST->MMIOVirtualAddr + 0xF004) = 0x1e6e0000; *(ULONG *) (pAST->MMIOVirtualAddr + 0xF000) = 0x1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-ast-1.0.1/src/ast_accel.c new/xf86-video-ast-1.1.5/src/ast_accel.c --- old/xf86-video-ast-1.0.1/src/ast_accel.c 2014-08-08 10:59:04.000000000 +0200 +++ new/xf86-video-ast-1.1.5/src/ast_accel.c 2015-08-19 03:24:48.000000000 +0200 @@ -191,7 +191,7 @@ /* Solid Lines */ if (pAST->ENGCaps & ENG_CAP_SolidLine) { - if ( (pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) || (pAST->jChipType == AST1180) ) + if ( (pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) || (pAST->jChipType == AST2500) || (pAST->jChipType == AST1180) ) { infoPtr->SubsequentSolidTwoPointLine = AIPSubsequentSolidTwoPointLine; } @@ -208,7 +208,7 @@ /* Dashed Lines */ if (pAST->ENGCaps & ENG_CAP_DashedLine) { - if ( (pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) || (pAST->jChipType == AST1180) ) + if ( (pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) || (pAST->jChipType == AST2500) || (pAST->jChipType == AST1180) ) { infoPtr->SubsequentDashedTwoPointLine = AIPSubsequentDashedTwoPointLine; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-ast-1.0.1/src/ast_driver.c new/xf86-video-ast-1.1.5/src/ast_driver.c --- old/xf86-video-ast-1.0.1/src/ast_driver.c 2014-08-08 10:59:04.000000000 +0200 +++ new/xf86-video-ast-1.1.5/src/ast_driver.c 2015-08-19 03:24:48.000000000 +0200 @@ -623,17 +623,10 @@ /* Enable VGA MMIO Access */ vASTEnableVGAMMIO(pScrn); - /* Init VGA Adapter */ - if (!xf86IsPrimaryPci(pAST->PciInfo)) - { - ASTInitVGA(pScrn, 0); - } - - vASTOpenKey(pScrn); - bASTRegInit(pScrn); - /* Get Chip Type */ - if (PCI_DEV_REVISION(pAST->PciInfo) >= 0x30) + if (PCI_DEV_REVISION(pAST->PciInfo) >= 0x40) + pAST->jChipType = AST2500; + else if (PCI_DEV_REVISION(pAST->PciInfo) >= 0x30) pAST->jChipType = AST2400; else if (PCI_DEV_REVISION(pAST->PciInfo) >= 0x20) pAST->jChipType = AST2300; @@ -642,6 +635,15 @@ else pAST->jChipType = AST2000; + /* Init VGA Adapter */ + if (!xf86IsPrimaryPci(pAST->PciInfo)) + { + ASTInitVGA(pScrn, 0); + } + + vASTOpenKey(pScrn); + bASTRegInit(pScrn); + /* Get Options from Scratch */ ASTGetScratchOptions(pScrn); @@ -685,7 +687,7 @@ clockRanges->doubleScanAllowed = FALSE; /* Add for AST2100, ycchen@061807 */ - if ((pAST->jChipType == AST2100) || (pAST->jChipType == AST2200) || (pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) || (pAST->jChipType == AST1180)) + if ((pAST->jChipType == AST2100) || (pAST->jChipType == AST2200) || (pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) || (pAST->jChipType == AST2500) || (pAST->jChipType == AST1180)) { maxPitch = 1920; maxHeight = 1200; @@ -1001,7 +1003,7 @@ xf86DPMSInit(pScreen, ASTDisplayPowerManagementSet, 0); #ifdef AstVideo - if ( (pAST->jChipType == AST1180) || (pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) ) + if ( (pAST->jChipType == AST1180) || (pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) || (pAST->jChipType == AST2500) ) { xf86DrvMsg(pScrn->scrnIndex, X_INFO,"AST Initial Video()\n"); ASTInitVideo(pScreen); @@ -1195,7 +1197,7 @@ if ( (mode->CrtcHDisplay == 1600) && (mode->CrtcVDisplay == 900) ) return MODE_OK; - if ( (pAST->jChipType == AST2100) || (pAST->jChipType == AST2200) || (pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) || (pAST->jChipType == AST1180) ) + if ( (pAST->jChipType == AST2100) || (pAST->jChipType == AST2200) || (pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) || (pAST->jChipType == AST2500) || (pAST->jChipType == AST1180) ) { if ( (mode->CrtcHDisplay == 1920) && (mode->CrtcVDisplay == 1080) ) return MODE_OK; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-ast-1.0.1/src/ast_mode.c new/xf86-video-ast-1.1.5/src/ast_mode.c --- old/xf86-video-ast-1.0.1/src/ast_mode.c 2014-08-08 10:59:04.000000000 +0200 +++ new/xf86-video-ast-1.1.5/src/ast_mode.c 2015-08-19 03:24:48.000000000 +0200 @@ -197,53 +197,53 @@ }; static VBIOS_ENHTABLE_STRUCT Res1600x900Table[] = { + {1760, 1600, 48, 32, 926, 900, 3, 5, VCLK97_75, /* 60Hz CVT RB */ + (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo | AST2500PreCatchCRT), 60, 2, 0x3A }, {2112, 1600, 88,168, 934, 900, 3, 5, VCLK118_25, /* 60Hz CVT */ (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x3A }, - {1760, 1600, 48, 32, 926, 900, 3, 5, VCLK97_75, /* 60Hz CVT RB */ - (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 2, 0x3A }, - {1760, 1600, 48, 32, 926, 900, 3, 5, VCLK97_75, /* end */ - (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 2, 0x3A }, + {2112, 1600, 88,168, 934, 900, 3, 5, VCLK118_25, /* end */ + (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 1, 0x3A }, }; static VBIOS_ENHTABLE_STRUCT Res1920x1080Table[] = { {2200, 1920, 88, 44, 1125, 1080, 4, 5, VCLK148_5, /* HDTV 60Hz */ - (SyncPP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x38 }, + (SyncPP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo | AST2500PreCatchCRT), 60, 1, 0x38 }, {2200, 1920, 88, 44, 1125, 1080, 4, 5, VCLK148_5, /* end */ - (SyncPP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 1, 0x38 }, + (SyncPP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo | AST2500PreCatchCRT), 0xFF, 1, 0x38 }, }; /* 16:10 */ static VBIOS_ENHTABLE_STRUCT Res1280x800Table[] = { + {1440, 1280, 48, 32, 823, 800, 3, 6, VCLK71, /* 60Hz CVT RB */ + (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo | AST2500PreCatchCRT), 60, 2, 35 }, {1680, 1280, 72,128, 831, 800, 3, 6, VCLK83_5, /* 60Hz CVT */ (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x35 }, - {1440, 1280, 48, 32, 823, 800, 3, 6, VCLK71, /* 60Hz CVT RB */ - (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 2, 35 }, - {1440, 1280, 48, 32, 823, 800, 3, 6, VCLK71, /* 60Hz CVT RB */ - (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 2, 35 }, + {1680, 1280, 72,128, 831, 800, 3, 6, VCLK83_5, /* end */ + (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 1, 0x35 }, }; static VBIOS_ENHTABLE_STRUCT Res1440x900Table[] = { + {1600, 1440, 48, 32, 926, 900, 3, 6, VCLK88_75, /* 60Hz CVT RB */ + (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo | AST2500PreCatchCRT), 60, 2, 0x36 }, {1904, 1440, 80,152, 934, 900, 3, 6, VCLK106_5, /* 60Hz CVT */ (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x36 }, - {1600, 1440, 48, 32, 926, 900, 3, 6, VCLK88_75, /* 60Hz CVT RB */ - (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 2, 0x36 }, - {1600, 1440, 48, 32, 926, 900, 3, 6, VCLK88_75, /* 60Hz CVT RB */ - (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 2, 0x36 }, + {1904, 1440, 80,152, 934, 900, 3, 6, VCLK106_5, /* end */ + (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 1, 0x36 }, }; static VBIOS_ENHTABLE_STRUCT Res1680x1050Table[] = { + {1840, 1680, 48, 32, 1080, 1050, 3, 6, VCLK119, /* 60Hz CVT RB */ + (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo | AST2500PreCatchCRT), 60, 2, 0x37 }, {2240, 1680,104,176, 1089, 1050, 3, 6, VCLK146_25, /* 60Hz CVT */ (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x37 }, - {1840, 1680, 48, 32, 1080, 1050, 3, 6, VCLK119, /* 60Hz CVT RB */ - (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 2, 0x37 }, - {1840, 1680, 48, 32, 1080, 1050, 3, 6, VCLK119, /* 60Hz CVT RB */ - (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 2, 0x37 }, + {2240, 1680,104,176, 1089, 1050, 3, 6, VCLK146_25, /* end */ + (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 1, 0x37 }, }; static VBIOS_ENHTABLE_STRUCT Res1920x1200Table[] = { - {2080, 1920, 48, 32, 1235, 1200, 3, 6, VCLK154, /* 60Hz */ - (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x34 }, - {2080, 1920, 48, 32, 1235, 1200, 3, 6, VCLK154, /* 60Hz */ + {2080, 1920, 48, 32, 1235, 1200, 3, 6, VCLK154, /* 60Hz CVT RB */ + (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo | AST2500PreCatchCRT), 60, 1, 0x34 }, + {2080, 1920, 48, 32, 1235, 1200, 3, 6, VCLK154, /* end */ (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 1, 0x34 }, }; @@ -307,6 +307,66 @@ {0x3b, 0x2c, 0x81}, /* 1A: VCLK118_25 */ }; +static VBIOS_DCLK_INFO DCLKTable_AST2500 [] = { + {0x40, 0x38, 0x73}, /* 00: VCLK25_175 */ + {0x3A, 0x38, 0x43}, /* 01: VCLK28_322 */ + {0x3E, 0x70, 0x73}, /* 02: VCLK31_5 */ + {0x35, 0x70, 0x43}, /* 03: VCLK36 */ + {0x31, 0x28, 0x73}, /* 04: VCLK40 */ + {0x41, 0x68, 0x73}, /* 05: VCLK49_5 */ + {0x31, 0x68, 0x53}, /* 06: VCLK50 */ + {0x4A, 0x68, 0x73}, /* 07: VCLK56_25 */ + {0x40, 0x68, 0x53}, /* 08: VCLK65 */ + {0x31, 0x60, 0x73}, /* 09: VCLK75 */ + {0x3A, 0x28, 0x43}, /* 0A: VCLK78_75 */ + {0x3E, 0x60, 0x73}, /* 0B: VCLK94_5 */ + {0x35, 0x60, 0x63}, /* 0C: VCLK108 */ + {0x3D, 0x40, 0x63}, /* 0D: VCLK135 */ + {0x4E, 0x60, 0x63}, /* 0E: VCLK157_5 */ + {0x35, 0x60, 0x53}, /* 0F: VCLK162 */ + {0x4C, 0x60, 0x63}, /* 10: VCLK154 */ + {0x4F, 0x48, 0x53}, /* 11: VCLK83.5 */ + {0x46, 0x60, 0x73}, /* 12: VCLK106.5 */ + {0x3C, 0x20, 0x63}, /* 13: VCLK146.25 */ + {0x3D, 0x20, 0x63}, /* 14: VCLK148.5 */ + {0x46, 0x68, 0x53}, /* 15: VCLK71 */ + {0x49, 0x68, 0x43}, /* 16: VCLK88.75 */ + {0x4e, 0x60, 0x73}, /* 17: VCLK119 */ + {0x38, 0x60, 0x73}, /* 18: VCLK85_5 */ + {0x38, 0x20, 0x73}, /* 19: VCLK97_75 */ + {0x4e, 0x60, 0x73}, /* 1A: VCLK118_25 */ +}; + +static VBIOS_DCLK_INFO DCLKTable_AST2500A1 [] = { + {0x2C, 0xE7, 0x03}, /* 00: VCLK25_175 */ + {0x95, 0x62, 0x03}, /* 01: VCLK28_322 */ + {0x67, 0x63, 0x01}, /* 02: VCLK31_5 */ + {0x76, 0x63, 0x01}, /* 03: VCLK36 */ + {0xEE, 0x67, 0x01}, /* 04: VCLK40 */ + {0x82, 0x62, 0x01}, /* 05: VCLK49_5 */ + {0xC6, 0x64, 0x01}, /* 06: VCLK50 */ + {0x94, 0x62, 0x01}, /* 07: VCLK56_25 */ + {0x80, 0x64, 0x00}, /* 08: VCLK65 */ + {0x7B, 0x63, 0x00}, /* 09: VCLK75 */ + {0x67, 0x62, 0x00}, /* 0A: VCLK78_75 */ + {0x7C, 0x62, 0x00}, /* 0B: VCLK94_5 */ + {0x8E, 0x62, 0x00}, /* 0C: VCLK108 */ + {0x85, 0x24, 0x00}, /* 0D: VCLK135 */ + {0x67, 0x22, 0x00}, /* 0E: VCLK157_5 */ + {0x6A, 0x22, 0x00}, /* 0F: VCLK162 */ + {0x4d, 0x4c, 0x80}, /* 10: VCLK154 */ + {0x68, 0x6f, 0x80}, /* 11: VCLK83.5 */ + {0x28, 0x49, 0x80}, /* 12: VCLK106.5 */ + {0x37, 0x49, 0x80}, /* 13: VCLK146.25 */ + {0x1f, 0x45, 0x80}, /* 14: VCLK148.5 */ + {0x47, 0x6c, 0x80}, /* 15: VCLK71 */ + {0x25, 0x65, 0x80}, /* 16: VCLK88.75 */ + {0x58, 0x01, 0x42}, /* 17: VCLK119 */ + {0x32, 0x67, 0x80}, /* 18: VCLK85_5 */ + {0x6a, 0x6d, 0x80}, /* 19: VCLK97_75 */ + {0x44, 0x20, 0x43}, /* 1A: VCLK118_25 */ +}; + static VBIOS_DAC_INFO DAC_TEXT[] = { { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x2a }, { 0x00, 0x2a, 0x00 }, { 0x00, 0x2a, 0x2a }, { 0x2a, 0x00, 0x00 }, { 0x2a, 0x00, 0x2a }, { 0x2a, 0x2a, 0x00 }, { 0x2a, 0x2a, 0x2a }, @@ -465,6 +525,9 @@ vSetSyncReg(pScrn, mode, &vgamodeinfo); bSetDACReg(pScrn, mode, &vgamodeinfo); + /* clear video buffer to avoid display noise */ + memset(pAST->FBVirtualAddr, 0x00, pAST->VideoModeInfo.ScreenPitch*pAST->VideoModeInfo.ScreenHeight); + vAST1000DisplayOn(pScrn); } @@ -495,6 +558,8 @@ ASTRecPtr pAST; ULONG ulModeID, ulColorIndex, ulRefreshRate, ulRefreshRateIndex = 0; ULONG ulHBorder, ulVBorder; + Bool check_sync; + PVBIOS_ENHTABLE_STRUCT loop, best = NULL; pAST = ASTPTR(pScrn); @@ -560,27 +625,34 @@ } /* Get Proper Mode Index */ - if (pVGAModeInfo->pEnhTableEntry->Flags & WideScreenMode) - { - /* parsing for wide screen reduced blank mode */ - if ((mode->Flags & V_NVSYNC) && (mode->Flags & V_PHSYNC)) /* CVT RB */ - pVGAModeInfo->pEnhTableEntry++; - } - else - { - ulRefreshRate = (mode->Clock * 1000) / (mode->HTotal * mode->VTotal); - - while (pVGAModeInfo->pEnhTableEntry->ulRefreshRate < ulRefreshRate) - { - pVGAModeInfo->pEnhTableEntry++; - if ((pVGAModeInfo->pEnhTableEntry->ulRefreshRate > ulRefreshRate) || - (pVGAModeInfo->pEnhTableEntry->ulRefreshRate == 0xFF)) - { - pVGAModeInfo->pEnhTableEntry--; - break; - } - } - } + ulRefreshRate = (mode->Clock * 1000) / (mode->HTotal * mode->VTotal) + 1; + loop = pVGAModeInfo->pEnhTableEntry; + check_sync = loop->Flags & WideScreenMode; + do { + while (loop->ulRefreshRate != 0xff) { + if ((check_sync) && + (((mode->Flags & V_NVSYNC) && + (loop->Flags & PVSync)) || + ((mode->Flags & V_PVSYNC) && + (loop->Flags & NVSync)) || + ((mode->Flags & V_NHSYNC) && + (loop->Flags & PHSync)) || + ((mode->Flags & V_PHSYNC) && + (loop->Flags & NHSync)))) { + loop++; + continue; + } + if (loop->ulRefreshRate <= ulRefreshRate + && (!best || loop->ulRefreshRate > best->ulRefreshRate)) + best = loop; + loop++; + } + if (best || !check_sync) + break; + check_sync = 0; + } while (1); + if (best) + pVGAModeInfo->pEnhTableEntry = best; /* Update mode CRTC info */ ulHBorder = (pVGAModeInfo->pEnhTableEntry->Flags & HBorder) ? 8:0; @@ -696,12 +768,16 @@ vSetCRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { ASTRecPtr pAST; - USHORT usTemp; + USHORT usTemp, ulPreCache = 0; UCHAR jReg05, jReg07, jReg09, jRegAC, jRegAD, jRegAE; pAST = ASTPTR(pScrn); jReg05 = jReg07 = jReg09 = jRegAC = jRegAD = jRegAE = 0; + /* init value */ + if ((pAST->jChipType == AST2500) && (pVGAModeInfo->pEnhTableEntry->Flags & AST2500PreCatchCRT)) + ulPreCache = 40; + /* unlock CRTC */ SetIndexRegMask(CRTC_PORT,0x11, 0x7F, 0x00); @@ -719,10 +795,10 @@ if (usTemp & 0x20) jReg05 |= 0x80; /* HBE D[5] */ if (usTemp & 0x40) jRegAD |= 0x01; /* HBE D[6] */ SetIndexRegMask(CRTC_PORT,0x03, 0xE0, (UCHAR) (usTemp & 0x1F)); - usTemp = (mode->CrtcHSyncStart >> 3 ) - 1; + usTemp = ((mode->CrtcHSyncStart - ulPreCache) >> 3 ) - 1; if (usTemp & 0x100) jRegAC |= 0x40; /* HRS D[5] */ SetIndexRegMask(CRTC_PORT,0x04, 0x00, (UCHAR) (usTemp)); - usTemp = ((mode->CrtcHSyncEnd >> 3 ) - 1) & 0x3F; + usTemp = (((mode->CrtcHSyncEnd - ulPreCache) >> 3 ) - 1) & 0x3F; if (usTemp & 0x20) jRegAD |= 0x04; /* HRE D[5] */ SetIndexRegMask(CRTC_PORT,0x05, 0x60, (UCHAR) ((usTemp & 0x1F) | jReg05)); @@ -762,6 +838,15 @@ SetIndexRegMask(CRTC_PORT,0x09, 0xDF, (UCHAR) jReg09); SetIndexRegMask(CRTC_PORT,0xAE, 0x00, (UCHAR) (jRegAE | 0x80)); /* disable line compare */ + if ((pAST->jChipType == AST2500) && (pVGAModeInfo->pEnhTableEntry->Flags & AST2500PreCatchCRT)) + { + SetIndexRegMask(CRTC_PORT,0xB6, 0x3F, 0x80); + } + else + { + SetIndexRegMask(CRTC_PORT,0xB6, 0x3F, 0x00); + } + /* lock CRTC */ SetIndexRegMask(CRTC_PORT,0x11, 0x7F, 0x80); @@ -790,14 +875,25 @@ pAST = ASTPTR(pScrn); pEnhModePtr = pVGAModeInfo->pEnhTableEntry; - if ((pAST->jChipType == AST2100) || (pAST->jChipType == AST1100) || (pAST->jChipType == AST2200) || (pAST->jChipType == AST2150) || (pAST->jChipType == AST2300) || (pAST->jChipType == AST2400)) + if ((pAST->jChipType == AST2500) && (PCI_DEV_REVISION(pAST->PciInfo) > 0x40)) + pDCLKPtr = &DCLKTable_AST2500A1[pEnhModePtr->DCLKIndex]; + else if ((pAST->jChipType == AST2500) && (PCI_DEV_REVISION(pAST->PciInfo) == 0x40)) + pDCLKPtr = &DCLKTable_AST2500[pEnhModePtr->DCLKIndex]; + else if ((pAST->jChipType == AST2100) || (pAST->jChipType == AST1100) || (pAST->jChipType == AST2200) || (pAST->jChipType == AST2150) || (pAST->jChipType == AST2300) || (pAST->jChipType == AST2400)) pDCLKPtr = &DCLKTable_AST2100[pEnhModePtr->DCLKIndex]; else pDCLKPtr = &DCLKTable[pEnhModePtr->DCLKIndex]; SetIndexRegMask(CRTC_PORT,0xC0, 0x00, pDCLKPtr->Param1); SetIndexRegMask(CRTC_PORT,0xC1, 0x00, pDCLKPtr->Param2); - SetIndexRegMask(CRTC_PORT,0xBB, 0x0F, (pDCLKPtr->Param3 & 0x80) | ((pDCLKPtr->Param3 & 0x03) << 4) ); + if ((pAST->jChipType == AST2500) && (PCI_DEV_REVISION(pAST->PciInfo) == 0x40)) + { + SetIndexRegMask(CRTC_PORT,0xBB, 0x0F, (pDCLKPtr->Param3 & 0xF0)); + } + else + { + SetIndexRegMask(CRTC_PORT,0xBB, 0x0F, (pDCLKPtr->Param3 & 0xC0) | ((pDCLKPtr->Param3 & 0x03) << 4) ); + } } @@ -842,7 +938,7 @@ #endif /* Set Threshold */ - if ((pAST->jChipType == AST2300) || (pAST->jChipType == AST2400)) + if ((pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) || (pAST->jChipType == AST2500)) { SetIndexReg(CRTC_PORT,0xA7, 0x78); SetIndexReg(CRTC_PORT,0xA6, 0x60); @@ -870,9 +966,10 @@ pEnhModePtr = pVGAModeInfo->pEnhTableEntry; jReg = GetReg(MISC_PORT_READ); - jReg |= (UCHAR) (pEnhModePtr->Flags & SyncNN); + jReg &= ~0xC0; + if (pEnhModePtr->Flags & NVSync) jReg |= 0x80; + if (pEnhModePtr->Flags & NHSync) jReg |= 0x40; SetReg(MISC_PORT_WRITE,jReg); - } static Bool bSetDACReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-ast-1.0.1/src/ast_mode.h new/xf86-video-ast-1.1.5/src/ast_mode.h --- old/xf86-video-ast-1.0.1/src/ast_mode.h 2014-08-08 10:59:04.000000000 +0200 +++ new/xf86-video-ast-1.1.5/src/ast_mode.h 2015-08-19 03:24:48.000000000 +0200 @@ -66,14 +66,19 @@ #define HalfDCLK 0x00000002 #define DoubleScanMode 0x00000004 #define LineCompareOff 0x00000008 -#define SyncPP 0x00000000 -#define SyncPN 0x00000040 -#define SyncNP 0x00000080 -#define SyncNN 0x000000C0 #define HBorder 0x00000020 #define VBorder 0x00000010 -#define WideScreenMode 0x00000100 -#define NewModeInfo 0x00000200 +#define WideScreenMode 0x00000100 +#define NewModeInfo 0x00000200 +#define NHSync 0x00000400 +#define PHSync 0x00000800 +#define NVSync 0x00001000 +#define PVSync 0x00002000 +#define SyncPP (PVSync | PHSync) +#define SyncPN (PVSync | NHSync) +#define SyncNP (NVSync | PHSync) +#define SyncNN (NVSync | NHSync) +#define AST2500PreCatchCRT 0x00004000 /* DAC Definition */ #define DAC_NUM_TEXT 64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-ast-1.0.1/src/ast_vgatool.c new/xf86-video-ast-1.1.5/src/ast_vgatool.c --- old/xf86-video-ast-1.0.1/src/ast_vgatool.c 2014-08-08 10:59:04.000000000 +0200 +++ new/xf86-video-ast-1.1.5/src/ast_vgatool.c 2015-08-19 03:24:48.000000000 +0200 @@ -446,7 +446,7 @@ pAST->ulDRAMBusWidth = 32; /* Get DRAM Type */ - if ((pAST->jChipType == AST2300) || (pAST->jChipType == AST2400)) + if ((pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) || (pAST->jChipType == AST2500)) { switch (ulData & 0x03) { @@ -576,7 +576,7 @@ /* Modify DARM utilization to 60% for AST1100/2100 16bits DRAM, ycchen@032508 */ if ( ((pAST->jChipType == AST2100) || (pAST->jChipType == AST1100) || (pAST->jChipType == AST2200) || (pAST->jChipType == AST2150)) && (ulDRAMBusWidth == 16) ) DRAMEfficiency = 600; - else if ((pAST->jChipType == AST2300) || (pAST->jChipType == AST2400)) + else if ((pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) || (pAST->jChipType == AST2500)) DRAMEfficiency = 400; ulDRAMBandwidth = ulMCLK * ulDRAMBusWidth * 2 / 8; ActualDRAMBandwidth = ulDRAMBandwidth * DRAMEfficiency / 1000; @@ -605,7 +605,7 @@ } /* Add for AST2100, ycchen@061807 */ - if ((pAST->jChipType == AST2100) || (pAST->jChipType == AST2200) || (pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) || (pAST->jChipType == AST1180) ) + if ((pAST->jChipType == AST2100) || (pAST->jChipType == AST2200) || (pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) || (pAST->jChipType == AST2500) || (pAST->jChipType == AST1180) ) { if (ulDCLK > 200) ulDCLK = 200; } @@ -670,7 +670,7 @@ if (jReg & 0x80) pAST->jTxChipType = Tx_Sil164; /* Get 3rd Tx Info from BMC Scratch */ - if ((pAST->jChipType == AST2300) || (pAST->jChipType == AST2400)) + if ((pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) || (pAST->jChipType == AST2500)) { GetIndexRegMask(CRTC_PORT, 0xD1, 0x0E, jReg); switch (jReg) @@ -1117,7 +1117,7 @@ } /* Set Ext. Reg */ - if ((pAST->jChipType == AST2300) || (pAST->jChipType == AST2400)) + if ((pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) || (pAST->jChipType == AST2500)) { if (PCI_DEV_REVISION(pAST->PciInfo) > 0x20) pjExtRegInfo = ExtRegInfo_AST2300; @@ -1145,12 +1145,28 @@ /* Enable RAMDAC for A1, ycchen@113005 */ jReg = 0x04; - if ((pAST->jChipType == AST2300) || (pAST->jChipType == AST2400)) + if ((pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) || (pAST->jChipType == AST2400)) jReg |= 0x20; SetIndexRegMask(CRTC_PORT,0xB6, 0xFF, jReg); } +static void vSetDefVCLK(ScrnInfoPtr pScrn) +{ + ASTRecPtr pAST = ASTPTR(pScrn); + + if ((pAST->jChipType == AST2500) && (PCI_DEV_REVISION(pAST->PciInfo) == 0x40)) + { + SetIndexRegMask(CRTC_PORT, 0xbc, 0x00, 0x40); + SetIndexRegMask(CRTC_PORT, 0xbd, 0x00, 0x38); + SetIndexRegMask(CRTC_PORT, 0xbe, 0x00, 0x3a); + SetIndexRegMask(CRTC_PORT, 0xbf, 0x00, 0x38); + SetIndexRegMask(CRTC_PORT, 0xcf, 0x00, 0x70); + SetIndexRegMask(CRTC_PORT, 0xb5, 0x00, 0xa8); + SetIndexRegMask(CRTC_PORT, 0xbb, 0x00, 0x43); + } +} + /* * AST2100/2150 DLL CBR Setting */ @@ -2908,12 +2924,485 @@ } /* vInitAST2300DRAMReg */ +/* + * AST2500 DRAM settings modules + */ +#define REGTBL_NUM 17 +#define REGIDX_010 0 +#define REGIDX_014 1 +#define REGIDX_018 2 +#define REGIDX_020 3 +#define REGIDX_024 4 +#define REGIDX_02C 5 +#define REGIDX_030 6 +#define REGIDX_214 7 +#define REGIDX_2E0 8 +#define REGIDX_2E4 9 +#define REGIDX_2E8 10 +#define REGIDX_2EC 11 +#define REGIDX_2F0 12 +#define REGIDX_2F4 13 +#define REGIDX_2F8 14 +#define REGIDX_RFC 15 +#define REGIDX_PLL 16 + +ULONG ddr3_1600_timing_table[REGTBL_NUM] = { +0x64604D38, /* 0x010 */ +0x29690599, /* 0x014 */ +0x00000300, /* 0x018 */ +0x00000000, /* 0x020 */ +0x00000000, /* 0x024 */ +0x02181E70, /* 0x02C */ +0x00000040, /* 0x030 */ +0x00000024, /* 0x214 */ +0x02001300, /* 0x2E0 */ +0x0E0000A0, /* 0x2E4 */ +0x000E001B, /* 0x2E8 */ +0x35B8C105, /* 0x2EC */ +0x08090408, /* 0x2F0 */ +0x9B000800, /* 0x2F4 */ +0x0E400A00, /* 0x2F8 */ +0x9971452F, /* tRFC */ +0x000071C1}; /* PLL */ + +ULONG ddr4_1600_timing_table[REGTBL_NUM] = { +0x63604E37, /* 0x010 */ +0xE97AFA99, /* 0x014 */ +0x00019000, /* 0x018 */ +0x08000000, /* 0x020 */ +0x00000400, /* 0x024 */ +0x00000410, /* 0x02C */ +0x00000101, /* 0x030 */ +0x00000024, /* 0x214 */ +0x03002900, /* 0x2E0 */ +0x0E0000A0, /* 0x2E4 */ +0x000E001C, /* 0x2E8 */ +0x35B8C106, /* 0x2EC */ +0x08080607, /* 0x2F0 */ +0x9B000900, /* 0x2F4 */ +0x0E400A00, /* 0x2F8 */ +0x99714545, /* tRFC */ +0x000071C1}; /* PLL */ + +static int MMCTestBurst_AST2500(ScrnInfoPtr pScrn, ULONG datagen) +{ + ASTRecPtr pAST = ASTPTR(pScrn); + UCHAR *mmiobase = pAST->MMIOVirtualAddr; + ULONG data, timecnt; + + MOutdwm(mmiobase, 0x1E6E0070, 0x00000000); + MOutdwm(mmiobase, 0x1E6E0070, 0x000000C1 | (datagen << 3)); + timecnt = 0; + do{ + data = MIndwm(mmiobase, 0x1E6E0070) & 0x3000; + if(data & 0x2000){ + return(0); + } + if(++timecnt > TIMEOUT){ + MOutdwm(mmiobase, 0x1E6E0070, 0x00000000); + return(0); + } + }while(!data); + MOutdwm(mmiobase, 0x1E6E0070, 0x00000000); + return(1); +} + +static int MMCTestSingle_AST2500(ScrnInfoPtr pScrn, ULONG datagen) +{ + ASTRecPtr pAST = ASTPTR(pScrn); + UCHAR *mmiobase = pAST->MMIOVirtualAddr; + ULONG data, timecnt; + + MOutdwm(mmiobase, 0x1E6E0070, 0x00000000); + MOutdwm(mmiobase, 0x1E6E0070, 0x00000085 | (datagen << 3)); + timecnt = 0; + do{ + data = MIndwm(mmiobase, 0x1E6E0070) & 0x3000; + if(data & 0x2000){ + return(0); + } + if(++timecnt > TIMEOUT){ + MOutdwm(mmiobase, 0x1E6E0070, 0x00000000); + return(0); + } + }while(!data); + MOutdwm(mmiobase, 0x1E6E0070, 0x00000000); + return(1); +} + +static ULONG CBRTest_AST2500(ScrnInfoPtr pScrn) +{ + ASTRecPtr pAST = ASTPTR(pScrn); + UCHAR *mmiobase = pAST->MMIOVirtualAddr; + + MOutdwm(mmiobase, 0x1E6E0074, 0x0000FFFF); + MOutdwm(mmiobase, 0x1E6E007C, 0xFF00FF00); + if(!MMCTestBurst_AST2500(pScrn, 0)) return(0); + if(!MMCTestSingle_AST2500(pScrn, 0)) return(0); + return(1); +} + +static void DDR_Init_Common(ScrnInfoPtr pScrn) +{ + ASTRecPtr pAST = ASTPTR(pScrn); + UCHAR *mmiobase = pAST->MMIOVirtualAddr; + + MOutdwm(mmiobase, 0x1E6E0034,0x00020080); + MOutdwm(mmiobase, 0x1E6E0008,0x2003000F); + MOutdwm(mmiobase, 0x1E6E0038,0x00000FFF); + MOutdwm(mmiobase, 0x1E6E0040,0x88448844); + MOutdwm(mmiobase, 0x1E6E0044,0x24422288); + MOutdwm(mmiobase, 0x1E6E0048,0x22222222); + MOutdwm(mmiobase, 0x1E6E004C,0x22222222); + MOutdwm(mmiobase, 0x1E6E0050,0x80000000); + MOutdwm(mmiobase, 0x1E6E0208,0x00000000); + MOutdwm(mmiobase, 0x1E6E0218,0x00000000); + MOutdwm(mmiobase, 0x1E6E0220,0x00000000); + MOutdwm(mmiobase, 0x1E6E0228,0x00000000); + MOutdwm(mmiobase, 0x1E6E0230,0x00000000); + MOutdwm(mmiobase, 0x1E6E02A8,0x00000000); + MOutdwm(mmiobase, 0x1E6E02B0,0x00000000); + MOutdwm(mmiobase, 0x1E6E0240,0x86000000); + MOutdwm(mmiobase, 0x1E6E0244,0x00008600); + MOutdwm(mmiobase, 0x1E6E0248,0x80000000); + MOutdwm(mmiobase, 0x1E6E024C,0x80808080); +} + +static void Do_DDRPHY_Init(ScrnInfoPtr pScrn) +{ + ASTRecPtr pAST = ASTPTR(pScrn); + UCHAR *mmiobase = pAST->MMIOVirtualAddr; + ULONG data, pass, timecnt; + + pass = 0; + MOutdwm(mmiobase, 0x1E6E0060,0x00000005); + while(!pass){ + for(timecnt = 0;timecnt < TIMEOUT;timecnt++){ + data = MIndwm(mmiobase, 0x1E6E0060) & 0x1; + if(!data){ + break; + } + } + if(timecnt != TIMEOUT){ + data = MIndwm(mmiobase, 0x1E6E0300) & 0x000A0000; + if(!data){ + pass = 1; + } + } + if(!pass){ + MOutdwm(mmiobase, 0x1E6E0060,0x00000000); + usleep(10); /* delay 10 us */ + MOutdwm(mmiobase, 0x1E6E0060,0x00000005); + } + } + + MOutdwm(mmiobase, 0x1E6E0060,0x00000006); +} + +/****************************************************************************** + Check DRAM Size + 1Gb : 0x80000000 ~ 0x87FFFFFF + 2Gb : 0x80000000 ~ 0x8FFFFFFF + 4Gb : 0x80000000 ~ 0x9FFFFFFF + 8Gb : 0x80000000 ~ 0xBFFFFFFF + *****************************************************************************/ +static void Check_DRAM_Size(ScrnInfoPtr pScrn, ULONG tRFC) +{ + ASTRecPtr pAST = ASTPTR(pScrn); + UCHAR *mmiobase = pAST->MMIOVirtualAddr; + ULONG reg_04, reg_14; + + reg_04 = MIndwm(mmiobase, 0x1E6E0004) & 0xfffffffc; + reg_14 = MIndwm(mmiobase, 0x1E6E0014) & 0xffffff00; + + MOutdwm(mmiobase, 0xA0100000, 0x41424344); + MOutdwm(mmiobase, 0x90100000, 0x35363738); + MOutdwm(mmiobase, 0x88100000, 0x292A2B2C); + MOutdwm(mmiobase, 0x80100000, 0x1D1E1F10); + + /* Check 8Gbit */ + if(MIndwm(mmiobase, 0xA0100000) == 0x41424344){ + reg_04 |= 0x03; + reg_14 |= (tRFC >> 24) & 0xFF; + /* Check 4Gbit */ + }else if(MIndwm(mmiobase, 0x90100000) == 0x35363738){ + reg_04 |= 0x02; + reg_14 |= (tRFC >> 16) & 0xFF; + /* Check 2Gbit */ + }else if(MIndwm(mmiobase, 0x88100000) == 0x292A2B2C){ + reg_04 |= 0x01; + reg_14 |= (tRFC >> 8) & 0xFF; + }else{ + reg_14 |= tRFC & 0xFF; + } + MOutdwm(mmiobase, 0x1E6E0004, reg_04); + MOutdwm(mmiobase, 0x1E6E0014, reg_14); +} + +static void Enable_Cache(ScrnInfoPtr pScrn) +{ + ASTRecPtr pAST = ASTPTR(pScrn); + UCHAR *mmiobase = pAST->MMIOVirtualAddr; + ULONG reg_04, data; + + reg_04 = MIndwm(mmiobase, 0x1E6E0004); + MOutdwm(mmiobase, 0x1E6E0004, reg_04 | 0x1000); + + do{ + data = MIndwm(mmiobase, 0x1E6E0004); + }while(!(data & 0x80000)); + MOutdwm(mmiobase, 0x1E6E0004, reg_04 | 0x400); +} + +static void Set_MPLL(ScrnInfoPtr pScrn) +{ + ASTRecPtr pAST = ASTPTR(pScrn); + UCHAR *mmiobase = pAST->MMIOVirtualAddr; + ULONG addr, data, param; + + /* Reset MMC */ + MOutdwm(mmiobase, 0x1E6E0000,0xFC600309); + MOutdwm(mmiobase, 0x1E6E0034,0x00020080); + for(addr = 0x1e6e0004;addr < 0x1e6e0090;){ + MOutdwm(mmiobase, addr, 0x0); + addr += 4; + } + MOutdwm(mmiobase, 0x1E6E0034,0x00020000); + + MOutdwm(mmiobase, 0x1E6E2000, 0x1688A8A8); + data = MIndwm(mmiobase, 0x1E6E2070) & 0x00800000; + if(data){ /* CLKIN = 25MHz */ + param = 0x930023E0; + }else{ /* CLKIN = 24MHz */ + param = 0x93002400; + } + MOutdwm(mmiobase, 0x1E6E2020, param); + usleep(100); +} + +static void DDR3_Init_AST2500(ScrnInfoPtr pScrn, ULONG *ddr_table) +{ + ASTRecPtr pAST = ASTPTR(pScrn); + UCHAR *mmiobase = pAST->MMIOVirtualAddr; + + MOutdwm(mmiobase, 0x1E6E0004,0x00000303); + MOutdwm(mmiobase, 0x1E6E0010,ddr_table[REGIDX_010]); + MOutdwm(mmiobase, 0x1E6E0014,ddr_table[REGIDX_014]); + MOutdwm(mmiobase, 0x1E6E0018,ddr_table[REGIDX_018]); + MOutdwm(mmiobase, 0x1E6E0020,ddr_table[REGIDX_020]); /* MODEREG4/6 */ + MOutdwm(mmiobase, 0x1E6E0024,ddr_table[REGIDX_024]); /* MODEREG5 */ + MOutdwm(mmiobase, 0x1E6E002C,ddr_table[REGIDX_02C] | 0x100); /* MODEREG0/2 */ + MOutdwm(mmiobase, 0x1E6E0030,ddr_table[REGIDX_030]); /* MODEREG1/3 */ + + /* DDR PHY Setting */ + MOutdwm(mmiobase, 0x1E6E0200,0x02492AAE); + MOutdwm(mmiobase, 0x1E6E0204,0x00001001); + MOutdwm(mmiobase, 0x1E6E020C,0x55E00B0B); + MOutdwm(mmiobase, 0x1E6E0210,0x20000000); + MOutdwm(mmiobase, 0x1E6E0214,ddr_table[REGIDX_214]); + MOutdwm(mmiobase, 0x1E6E02E0,ddr_table[REGIDX_2E0]); + MOutdwm(mmiobase, 0x1E6E02E4,ddr_table[REGIDX_2E4]); + MOutdwm(mmiobase, 0x1E6E02E8,ddr_table[REGIDX_2E8]); + MOutdwm(mmiobase, 0x1E6E02EC,ddr_table[REGIDX_2EC]); + MOutdwm(mmiobase, 0x1E6E02F0,ddr_table[REGIDX_2F0]); + MOutdwm(mmiobase, 0x1E6E02F4,ddr_table[REGIDX_2F4]); + MOutdwm(mmiobase, 0x1E6E02F8,ddr_table[REGIDX_2F8]); + MOutdwm(mmiobase, 0x1E6E0290,0x00100008); + MOutdwm(mmiobase, 0x1E6E02C0,0x00000006); + + /* Controller Setting */ + MOutdwm(mmiobase, 0x1E6E0034,0x00020091); + + /* Wait DDR PHY init done */ + Do_DDRPHY_Init(pScrn); + + MOutdwm(mmiobase, 0x1E6E0120,ddr_table[REGIDX_PLL]); + MOutdwm(mmiobase, 0x1E6E000C,0x42AA5C81); + MOutdwm(mmiobase, 0x1E6E0034,0x0001AF93); + + Check_DRAM_Size(pScrn, ddr_table[REGIDX_RFC]); + Enable_Cache(pScrn); + MOutdwm(mmiobase, 0x1E6E001C,0x00000008); + MOutdwm(mmiobase, 0x1E6E0038,0xFFFFFF00); +} + +static void DDR4_Init_AST2500(ScrnInfoPtr pScrn, ULONG *ddr_table) +{ + ASTRecPtr pAST = ASTPTR(pScrn); + UCHAR *mmiobase = pAST->MMIOVirtualAddr; + ULONG data, data2, pass; + ULONG ddr_vref, phy_vref; + ULONG min_ddr_vref, min_phy_vref; + ULONG max_ddr_vref, max_phy_vref; + + MOutdwm(mmiobase, 0x1E6E0004,0x00000313); + MOutdwm(mmiobase, 0x1E6E0010,ddr_table[REGIDX_010]); + MOutdwm(mmiobase, 0x1E6E0014,ddr_table[REGIDX_014]); + MOutdwm(mmiobase, 0x1E6E0018,ddr_table[REGIDX_018]); + MOutdwm(mmiobase, 0x1E6E0020,ddr_table[REGIDX_020]); /* MODEREG4/6 */ + MOutdwm(mmiobase, 0x1E6E0024,ddr_table[REGIDX_024]); /* MODEREG5 */ + MOutdwm(mmiobase, 0x1E6E002C,ddr_table[REGIDX_02C] | 0x100); /* MODEREG0/2 */ + MOutdwm(mmiobase, 0x1E6E0030,ddr_table[REGIDX_030]); /* MODEREG1/3 */ + + /* DDR PHY Setting */ + MOutdwm(mmiobase, 0x1E6E0200,0x42492AAE); + MOutdwm(mmiobase, 0x1E6E0204,0x09002000); + MOutdwm(mmiobase, 0x1E6E020C,0x55E00B0B); + MOutdwm(mmiobase, 0x1E6E0210,0x20000000); + MOutdwm(mmiobase, 0x1E6E0214,ddr_table[REGIDX_214]); + MOutdwm(mmiobase, 0x1E6E02E0,ddr_table[REGIDX_2E0]); + MOutdwm(mmiobase, 0x1E6E02E4,ddr_table[REGIDX_2E4]); + MOutdwm(mmiobase, 0x1E6E02E8,ddr_table[REGIDX_2E8]); + MOutdwm(mmiobase, 0x1E6E02EC,ddr_table[REGIDX_2EC]); + MOutdwm(mmiobase, 0x1E6E02F0,ddr_table[REGIDX_2F0]); + MOutdwm(mmiobase, 0x1E6E02F4,ddr_table[REGIDX_2F4]); + MOutdwm(mmiobase, 0x1E6E02F8,ddr_table[REGIDX_2F8]); + MOutdwm(mmiobase, 0x1E6E0290,0x00100008); + MOutdwm(mmiobase, 0x1E6E02C4,0x3C183C3C); + MOutdwm(mmiobase, 0x1E6E02C8,0x00631E0E); + + /* Controller Setting */ + MOutdwm(mmiobase, 0x1E6E0034,0x0001A991); + + /* Train PHY Vref first */ + min_phy_vref = max_phy_vref = 0x0; + pass = 0; + MOutdwm(mmiobase, 0x1E6E02C0,0x00001C06); + for(phy_vref = 0x40;phy_vref < 0x80;phy_vref++){ + MOutdwm(mmiobase, 0x1E6E000C,0x00000000); + MOutdwm(mmiobase, 0x1E6E0060,0x00000000); + MOutdwm(mmiobase, 0x1E6E02CC,phy_vref | (phy_vref << 8)); + /* Fire DFI Init */ + Do_DDRPHY_Init(pScrn); + MOutdwm(mmiobase, 0x1E6E000C,0x00005C01); + if(CBRTest_AST2500(pScrn)){ + pass++; + data = MIndwm(mmiobase, 0x1E6E03D0); + data2 = data >> 8; + data = data & 0xff; + if(data > data2){ + data = data2; + } + + if(max_phy_vref < data){ + max_phy_vref = data; + min_phy_vref = phy_vref; + } + }else if(pass > 0){ + break; + } + } + MOutdwm(mmiobase, 0x1E6E02CC,min_phy_vref | (min_phy_vref << 8)); + + /* Train DDR Vref next */ + min_ddr_vref = 0xFF; + max_ddr_vref = 0x0; + pass = 0; + for(ddr_vref = 0x00;ddr_vref < 0x40;ddr_vref++){ + MOutdwm(mmiobase, 0x1E6E000C,0x00000000); + MOutdwm(mmiobase, 0x1E6E0060,0x00000000); + MOutdwm(mmiobase, 0x1E6E02C0,0x00000006 | (ddr_vref << 8)); + /* Fire DFI Init */ + Do_DDRPHY_Init(pScrn); + MOutdwm(mmiobase, 0x1E6E000C,0x00005C01); + if(CBRTest_AST2500(pScrn)){ + pass++; + if(min_ddr_vref > ddr_vref){ + min_ddr_vref = ddr_vref; + } + if(max_ddr_vref < ddr_vref){ + max_ddr_vref = ddr_vref; + } + }else if(pass != 0){ + break; + } + } + MOutdwm(mmiobase, 0x1E6E000C,0x00000000); + MOutdwm(mmiobase, 0x1E6E0060,0x00000000); + ddr_vref = (min_ddr_vref + max_ddr_vref + 1) >> 1; + MOutdwm(mmiobase, 0x1E6E02C0,0x00000006 | (ddr_vref << 8)); + + /* Wait DDR PHY init done */ + Do_DDRPHY_Init(pScrn); + + MOutdwm(mmiobase, 0x1E6E0120,ddr_table[REGIDX_PLL]); + MOutdwm(mmiobase, 0x1E6E000C,0x42AA5C81); + MOutdwm(mmiobase, 0x1E6E0034,0x0001AF93); + + Check_DRAM_Size(pScrn, ddr_table[REGIDX_RFC]); + Enable_Cache(pScrn); + MOutdwm(mmiobase, 0x1E6E001C,0x00000008); + MOutdwm(mmiobase, 0x1E6E0038,0xFFFFFF00); +} + +static int DRAM_Init_AST2500(ScrnInfoPtr pScrn) +{ + ASTRecPtr pAST = ASTPTR(pScrn); + UCHAR *mmiobase = pAST->MMIOVirtualAddr; + ULONG data; + + Set_MPLL(pScrn); + DDR_Init_Common(pScrn); + data = MIndwm(mmiobase, 0x1E6E2070); + if(data & 0x01000000){ + DDR4_Init_AST2500(pScrn, ddr4_1600_timing_table); + }else{ + DDR3_Init_AST2500(pScrn, ddr3_1600_timing_table); + } + MOutdwm(mmiobase, 0x1E6E2040, MIndwm(mmiobase, 0x1E6E2040) | 0x41); + /* Patch code */ + data = MIndwm(mmiobase, 0x1E6E200C) & 0xF9FFFFFF; + MOutdwm(mmiobase, 0x1E6E200C, data | 0x10000000); + return(1); +} + +static void vInitAST2500DRAMReg(ScrnInfoPtr pScrn) +{ + ASTRecPtr pAST = ASTPTR(pScrn); + ULONG ulTemp; + UCHAR jReg; + + GetIndexRegMask(CRTC_PORT, 0xD0, 0xFF, jReg); + + if ((jReg & 0x80) == 0) /* VGA only */ + { + *(ULONG *) (pAST->MMIOVirtualAddr + 0xF004) = 0x1e6e0000; + *(ULONG *) (pAST->MMIOVirtualAddr + 0xF000) = 0x1; + + *(ULONG *) (pAST->MMIOVirtualAddr + 0x12000) = 0x1688A8A8; + do { + ; + } while (*(volatile ULONG *) (pAST->MMIOVirtualAddr + 0x12000) != 0x01); + + *(ULONG *) (pAST->MMIOVirtualAddr + 0x10000) = 0xFC600309; + do { + ; + } while (*(volatile ULONG *) (pAST->MMIOVirtualAddr + 0x10000) != 0x01); + + /* Slow down CPU/AHB CLK in VGA only mode */ + ulTemp = *(ULONG *) (pAST->MMIOVirtualAddr + 0x12008); + ulTemp |= 0x73; + *(ULONG *) (pAST->MMIOVirtualAddr + 0x12008) = ulTemp; + + DRAM_Init_AST2500(pScrn); + + ulTemp = MIndwm(pAST->MMIOVirtualAddr, 0x1E6E2040); + MOutdwm(pAST->MMIOVirtualAddr, 0x1E6E2040, ulTemp | 0x40); + } + + /* wait ready */ + do { + GetIndexRegMask(CRTC_PORT, 0xD0, 0xFF, jReg); + } while ((jReg & 0x40) == 0); + +} /* vInitAST2500DRAMReg */ + void static vGetDefaultSettings(ScrnInfoPtr pScrn) { ASTRecPtr pAST = ASTPTR(pScrn); ULONG ulData; - if ((pAST->jChipType == AST2300) || (pAST->jChipType == AST2400)) + if ((pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) || (pAST->jChipType == AST2500)) { *(ULONG *) (pAST->MMIOVirtualAddr + 0xF004) = 0x1e6e0000; *(ULONG *) (pAST->MMIOVirtualAddr + 0xF000) = 0x1; @@ -3020,7 +3509,7 @@ UCHAR jReg; /* Only support on AST2300/2400 */ - if ((pAST->jChipType == AST2300) || (pAST->jChipType == AST2400)) + if ((pAST->jChipType == AST2300) || (pAST->jChipType == AST2400) || (pAST->jChipType == AST2500)) { GetIndexRegMask(CRTC_PORT, 0xD1, 0xFF, jReg); /* D[1]: DVO Enable */ switch (jReg & 0x0E) /* D[11:9] */ @@ -3069,12 +3558,15 @@ vEnableVGA(pScrn); vASTOpenKey(pScrn); + vSetDefVCLK(pScrn); vSetDefExtReg(pScrn); if (Flags == 0) vGetDefaultSettings(pScrn); - if ((pAST->jChipType == AST2300) || (pAST->jChipType == AST2400)) + if (pAST->jChipType == AST2500) + vInitAST2500DRAMReg(pScrn); + else if ((pAST->jChipType == AST2300) || (pAST->jChipType == AST2400)) vInitAST2300DRAMReg(pScrn); else vInitDRAMReg(pScrn); @@ -3444,7 +3936,7 @@ void vASTEnableVGAMMIO(ScrnInfoPtr pScrn) { ASTRecPtr pAST = ASTPTR(pScrn); - ULONG ulData; + uint32_t ulData; UCHAR jReg; jReg = inb(pAST->RelocateIO + 0x43);

1 0

commit extreme-tuxracer for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '15

27 Sep '15

Hello community, here is the log from the commit of package extreme-tuxracer for openSUSE:Factory checked in at 2015-09-27 08:39:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/extreme-tuxracer (Old) and /work/SRC/openSUSE:Factory/.extreme-tuxracer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "extreme-tuxracer" Changes: -------- --- /work/SRC/openSUSE:Factory/extreme-tuxracer/extreme-tuxracer.changes 2015-01-14 11:45:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.extreme-tuxracer.new/extreme-tuxracer.changes 2015-09-27 08:39:17.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Sep 23 16:14:16 UTC 2015 - nemysis(a)openSUSE.org + +- Use %{oname} instead of etr +- Change URL +- Use BuildRequires pkgconfig() instead of devel packages +- Add BuildRequires for dos2unix +- Change Description +- Use default autoreconf -fi and %make_install +- Use for suse_update_desktop_file and fdupes %if 0%{?suse_version} + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ extreme-tuxracer.spec ++++++ --- /var/tmp/diff_new_pack.LUzk2S/_old 2015-09-27 08:39:18.000000000 +0200 +++ /var/tmp/diff_new_pack.LUzk2S/_new 2015-09-27 08:39:18.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package extreme-tuxracer # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -16,24 +16,26 @@ # +%define oname etr + Name: extreme-tuxracer Version: 0.6.0 Release: 0 Summary: Open source racing game featuring Tux the Linux Penguin -%global pkgsummary %summary License: GPL-2.0 Group: Amusements/Games/3D/Race -Url: http://www.extremetuxracer.com -Source: http://downloads.sourceforge.net/extremetuxracer/etr-%{version}.tar.xz -BuildRequires: SDL-devel -BuildRequires: SDL_mixer-devel -BuildRequires: SDL_image-devel -BuildRequires: fdupes -BuildRequires: freetype2-devel +%global pkgsummary %summary +Url: http://sourceforge.net/projects/extremetuxracer/ +Source: http://downloads.sourceforge.net/extremetuxracer/%{oname}-%{version}.tar.xz +BuildRequires: dos2unix BuildRequires: gcc-c++ BuildRequires: libpng-devel BuildRequires: libtool -BuildRequires: pkgconfig +BuildRequires: pkgconfig(SDL_image) +BuildRequires: pkgconfig(SDL_mixer) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(sdl) + %if 0%{?sles_version} BuildRequires: Mesa-devel BuildRequires: xorg-x11-libXmu-devel @@ -46,34 +48,45 @@ BuildRequires: pkgconfig(xt) %endif %if 0%{?suse_version} +BuildRequires: fdupes BuildRequires: update-desktop-files %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Extreme Tux Racer is an open source racing game featuring Tux the Linux -Penguin. ETRacer continues in the tracks of Tux Racer and its forks. +Extreme Tux Racer is an open source racing game featuring Tux +the Linux Penguin. Extreme Tux Racer continues in the tracks +of Tux Racer and its forks. %prep -%setup -q -n etr-%{version} +%setup -q -n %{oname}-%{version} + +# Convert to unix line end +dos2unix gui.h gui.cpp ogl.cpp race_select.cpp version.rc data/char/samuel/start.lst %build -NOCONFIGURE=1 ./autogen.sh +autoreconf -fi + %configure make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install -%suse_update_desktop_file etr -%fdupes -s %{buildroot}%{_datadir} -rm -rf %{buildroot}%{_datadir}/doc +%make_install + +%if 0%{?suse_version} + %suse_update_desktop_file %{oname} + %fdupes -s %{buildroot}%{_prefix} +%endif + +# Remove not needed files +rm -fr %{buildroot}%{_datadir}/doc %files %defattr(-,root,root) %doc AUTHORS COPYING doc/code doc/courses_events doc/guide doc/score_algorithm -%{_bindir}/etr -%{_datadir}/etr/ -%{_datadir}/pixmaps/etr.png -%{_datadir}/applications/etr.desktop +%{_bindir}/%{oname} +%{_datadir}/%{oname}/ +%{_datadir}/pixmaps/%{oname}.png +%{_datadir}/applications/%{oname}.desktop %changelog

1 0

commit rubygem-gettext for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '15

27 Sep '15

Hello community, here is the log from the commit of package rubygem-gettext for openSUSE:Factory checked in at 2015-09-27 08:39:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-gettext (Old) and /work/SRC/openSUSE:Factory/.rubygem-gettext.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-gettext" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-gettext/rubygem-gettext.changes 2015-02-16 21:12:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-gettext.new/rubygem-gettext.changes 2015-09-27 08:39:16.000000000 +0200 @@ -1,0 +2,28 @@ +Wed Sep 23 04:30:03 UTC 2015 - coolo(a)suse.com + +- updated to version 3.1.7 + see installed news.md + + ## 3.1.7: 2015-09-22 {#version-3-1-7} + + ### Improvements + + * Supported 3 character language names. + [GitHub#39][Patch by Vilius Paulauskas] + * Suppressed duplicated range in regular expression warning. + [GitHub#40][Patch by Vilius Paulauskas] + * Replaced invalid character instead of raising an error on encoding + conversion. + [GitHub#41][Patch by Vilius Paulauskas] + + ### Fixes + + * Fixed a bug that undefined method is used. + [GitHub#38][Patch by Hiroshi Hatake] + + ### Thanks + + * Hiroshi Hatake + * Vilius Paulauskas + +------------------------------------------------------------------- Old: ---- gettext-3.1.6.gem New: ---- gettext-3.1.7.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-gettext.spec ++++++ --- /var/tmp/diff_new_pack.zB6duw/_old 2015-09-27 08:39:16.000000000 +0200 +++ /var/tmp/diff_new_pack.zB6duw/_new 2015-09-27 08:39:16.000000000 +0200 @@ -24,7 +24,7 @@ # Name: rubygem-gettext -Version: 3.1.6 +Version: 3.1.7 Release: 0 %define mod_name gettext %define mod_full_name %{mod_name}-%{version} ++++++ gettext-3.1.6.gem -> gettext-3.1.7.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Rakefile new/Rakefile --- old/Rakefile 2015-01-20 15:54:06.000000000 +0100 +++ new/Rakefile 2015-09-22 07:16:54.000000000 +0200 @@ -128,7 +128,14 @@ task "samples:gettext" => "samples:cgi:gettext" -["untranslated", "backslash", "non_ascii", "np_", "p_"].each do |domain| +[ + "untranslated", + "backslash", + "non_ascii", + "np_", + "p_", + "hello", +].each do |domain| GetText::Tools::Task.define do |task| task.package_name = domain task.package_version = spec.version.to_s Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/text/news.md new/doc/text/news.md --- old/doc/text/news.md 2015-01-20 15:54:06.000000000 +0100 +++ new/doc/text/news.md 2015-09-22 07:16:54.000000000 +0200 @@ -1,5 +1,27 @@ # News +## 3.1.7: 2015-09-22 {#version-3-1-7} + +### Improvements + + * Supported 3 character language names. + [GitHub#39][Patch by Vilius Paulauskas] + * Suppressed duplicated range in regular expression warning. + [GitHub#40][Patch by Vilius Paulauskas] + * Replaced invalid character instead of raising an error on encoding + conversion. + [GitHub#41][Patch by Vilius Paulauskas] + +### Fixes + + * Fixed a bug that undefined method is used. + [GitHub#38][Patch by Hiroshi Hatake] + +### Thanks + + * Hiroshi Hatake + * Vilius Paulauskas + ## 3.1.6: 2015-01-20 {#version-3-1-6} ### Fixes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/gettext/mo.rb new/lib/gettext/mo.rb --- old/lib/gettext/mo.rb 2015-01-20 15:54:06.000000000 +0100 +++ new/lib/gettext/mo.rb 2015-09-22 07:16:54.000000000 +0200 @@ -318,17 +318,10 @@ return string end - begin - string.encode(@output_charset, @charset) - rescue EncodingError - if $DEBUG - warn "@charset = ", @charset - warn "@output_charset = ", @output_charset - warn "msgid = ", original_string - warn "msgstr = ", string - end - string - end + string.encode(@output_charset, + @charset, + :invalid => :replace, + :undef => :replace) end def generate_original_string(msgid, options) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/gettext/tools/msgcat.rb new/lib/gettext/tools/msgcat.rb --- old/lib/gettext/tools/msgcat.rb 2015-01-20 15:54:06.000000000 +0100 +++ new/lib/gettext/tools/msgcat.rb 2015-09-22 07:16:54.000000000 +0200 @@ -124,7 +124,7 @@ new_msgstr = "" msgstr.each_line do |line| case line - when /\A([\w\d\-_]+):/ + when /\A([\w\-]+):/ name = $1 next if remove_header_fields.include?(name) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/gettext/tools/task.rb new/lib/gettext/tools/task.rb --- old/lib/gettext/tools/task.rb 2015-01-20 15:54:06.000000000 +0100 +++ new/lib/gettext/tools/task.rb 2015-09-22 07:16:54.000000000 +0200 @@ -455,7 +455,8 @@ "rake #{_task.name} LOCALE=${LOCALE}'" end define_po_file_task(locale) - Rake::Task[po_file(locale)].invoke + path = create_path(locale) + Rake::Task[path.po_file].invoke end update_tasks = [] @@ -514,7 +515,7 @@ Dir.open(po_base_directory) do |dir| dir.each do |entry| - next unless /\A[a-z]{2}(?:_[A-Z]{2})?\z/ =~ entry + next unless /\A[a-z]{2,3}(?:_[A-Z]{2})?\z/ =~ entry next unless File.directory?(File.join(dir.path, entry)) locales << entry end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/gettext/version.rb new/lib/gettext/version.rb --- old/lib/gettext/version.rb 2015-01-20 15:54:06.000000000 +0100 +++ new/lib/gettext/version.rb 2015-09-22 07:16:54.000000000 +0200 @@ -9,5 +9,5 @@ =end module GetText - VERSION = "3.1.6" + VERSION = "3.1.7" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2015-01-20 15:54:06.000000000 +0100 +++ new/metadata 2015-09-22 07:16:54.000000000 +0200 @@ -1,7 +1,7 @@ --- !ruby/object:Gem::Specification name: gettext version: !ruby/object:Gem::Version - version: 3.1.6 + version: 3.1.7 platform: ruby authors: - Kouhei Sutou @@ -9,7 +9,7 @@ autorequire: bindir: bin cert_chain: [] -date: 2015-01-20 00:00:00.000000000 Z +date: 2015-09-22 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: locale @@ -1528,6 +1528,7 @@ - test/fixtures/erb/ascii.rxml - test/fixtures/erb/non_ascii.rhtml - test/fixtures/gladeparser.glade +- test/fixtures/hello.rb - test/fixtures/multi_text_domain.rb - test/fixtures/n_.rb - test/fixtures/non_ascii.rb @@ -1584,6 +1585,7 @@ - test/po/ja/backslash.edit.po - test/po/ja/backslash.po - test/po/ja/backslash.po.time_stamp +- test/po/ja/hello.po - test/po/ja/non_ascii.edit.po - test/po/ja/non_ascii.po - test/po/ja/non_ascii.po.time_stamp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/bg/gettext.edit.po new/po/bg/gettext.edit.po --- old/po/bg/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/bg/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -566,6 +566,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/bg/gettext.po new/po/bg/gettext.po --- old/po/bg/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/bg/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -466,6 +466,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/bs/gettext.edit.po new/po/bs/gettext.edit.po --- old/po/bs/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/bs/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -571,6 +571,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/bs/gettext.po new/po/bs/gettext.po --- old/po/bs/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/bs/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -472,6 +472,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/ca/gettext.edit.po new/po/ca/gettext.edit.po --- old/po/ca/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/ca/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -566,6 +566,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/ca/gettext.po new/po/ca/gettext.po --- old/po/ca/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/ca/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -468,6 +468,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/cs/gettext.edit.po new/po/cs/gettext.edit.po --- old/po/cs/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/cs/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -573,6 +573,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/cs/gettext.po new/po/cs/gettext.po --- old/po/cs/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/cs/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -474,6 +474,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/de/gettext.edit.po new/po/de/gettext.edit.po --- old/po/de/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/de/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -580,6 +580,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/de/gettext.po new/po/de/gettext.po --- old/po/de/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/de/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -481,6 +481,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/el/gettext.edit.po new/po/el/gettext.edit.po --- old/po/el/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/el/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -576,6 +576,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/el/gettext.po new/po/el/gettext.po --- old/po/el/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/el/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -477,6 +477,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/eo/gettext.edit.po new/po/eo/gettext.edit.po --- old/po/eo/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/eo/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -579,6 +579,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/eo/gettext.po new/po/eo/gettext.po --- old/po/eo/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/eo/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -478,6 +478,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/es/gettext.edit.po new/po/es/gettext.edit.po --- old/po/es/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/es/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -577,6 +577,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/es/gettext.po new/po/es/gettext.po --- old/po/es/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/es/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -479,6 +479,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/et/gettext.edit.po new/po/et/gettext.edit.po --- old/po/et/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/et/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -577,6 +577,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/et/gettext.po new/po/et/gettext.po --- old/po/et/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/et/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -477,6 +477,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/fr/gettext.edit.po new/po/fr/gettext.edit.po --- old/po/fr/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/fr/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -578,6 +578,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/fr/gettext.po new/po/fr/gettext.po --- old/po/fr/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/fr/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -481,6 +481,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/gettext.pot new/po/gettext.pot --- old/po/gettext.pot 2015-01-20 15:54:06.000000000 +0100 +++ new/po/gettext.pot 2015-09-22 07:16:54.000000000 +0200 @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: gettext 3.1.6\n" +"Project-Id-Version: gettext 3.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-20 23:54+0900\n" -"PO-Revision-Date: 2015-01-20 23:54+0900\n" +"POT-Creation-Date: 2015-09-22 14:16+0900\n" +"PO-Revision-Date: 2015-09-22 14:16+0900\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "Language: \n" @@ -594,6 +594,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 #: ../test/fixtures/multi_text_domain.rb:24 #: ../test/fixtures/multi_text_domain.rb:43 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/hr/gettext.edit.po new/po/hr/gettext.edit.po --- old/po/hr/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/hr/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -577,6 +577,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/hr/gettext.po new/po/hr/gettext.po --- old/po/hr/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/hr/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -477,6 +477,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/hu/gettext.edit.po new/po/hu/gettext.edit.po --- old/po/hu/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/hu/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -577,6 +577,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/hu/gettext.po new/po/hu/gettext.po --- old/po/hu/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/hu/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -477,6 +477,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/it/gettext.edit.po new/po/it/gettext.edit.po --- old/po/it/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/it/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -575,6 +575,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/it/gettext.po new/po/it/gettext.po --- old/po/it/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/it/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -477,6 +477,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/ja/gettext.edit.po new/po/ja/gettext.edit.po --- old/po/ja/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/ja/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -563,6 +563,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/ja/gettext.po new/po/ja/gettext.po --- old/po/ja/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/ja/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -468,6 +468,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/ko/gettext.edit.po new/po/ko/gettext.edit.po --- old/po/ko/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/ko/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -576,6 +576,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/ko/gettext.po new/po/ko/gettext.po --- old/po/ko/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/ko/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -475,6 +475,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/lv/gettext.edit.po new/po/lv/gettext.edit.po --- old/po/lv/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/lv/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -577,6 +577,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/lv/gettext.po new/po/lv/gettext.po --- old/po/lv/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/lv/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -477,6 +477,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/nb/gettext.edit.po new/po/nb/gettext.edit.po --- old/po/nb/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/nb/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -577,6 +577,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/nb/gettext.po new/po/nb/gettext.po --- old/po/nb/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/nb/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -477,6 +477,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/nl/gettext.edit.po new/po/nl/gettext.edit.po --- old/po/nl/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/nl/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -576,6 +576,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/nl/gettext.po new/po/nl/gettext.po --- old/po/nl/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/nl/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -477,6 +477,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/pt_BR/gettext.edit.po new/po/pt_BR/gettext.edit.po --- old/po/pt_BR/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/pt_BR/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -578,6 +578,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/pt_BR/gettext.po new/po/pt_BR/gettext.po --- old/po/pt_BR/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/pt_BR/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -479,6 +479,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/ru/gettext.edit.po new/po/ru/gettext.edit.po --- old/po/ru/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/ru/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -578,6 +578,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/ru/gettext.po new/po/ru/gettext.po --- old/po/ru/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/ru/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -479,6 +479,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/sr/gettext.edit.po new/po/sr/gettext.edit.po --- old/po/sr/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/sr/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -578,6 +578,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/sr/gettext.po new/po/sr/gettext.po --- old/po/sr/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/sr/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -478,6 +478,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/sv/gettext.edit.po new/po/sv/gettext.edit.po --- old/po/sv/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/sv/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -566,6 +566,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/sv/gettext.po new/po/sv/gettext.po --- old/po/sv/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/sv/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -463,6 +463,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/uk/gettext.edit.po new/po/uk/gettext.edit.po --- old/po/uk/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/uk/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -581,6 +581,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/uk/gettext.po new/po/uk/gettext.po --- old/po/uk/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/uk/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -482,6 +482,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/vi/gettext.edit.po new/po/vi/gettext.edit.po --- old/po/vi/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/vi/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -577,6 +577,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/vi/gettext.po new/po/vi/gettext.po --- old/po/vi/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/vi/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -477,6 +477,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/zh/gettext.edit.po new/po/zh/gettext.edit.po --- old/po/zh/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/zh/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -580,6 +580,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/zh/gettext.po new/po/zh/gettext.po --- old/po/zh/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/zh/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -479,6 +479,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/zh_TW/gettext.edit.po new/po/zh_TW/gettext.edit.po --- old/po/zh_TW/gettext.edit.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/zh_TW/gettext.edit.po 2015-09-22 07:16:54.000000000 +0200 @@ -579,6 +579,10 @@ msgid "duplicated" msgstr "" +#: ../test/fixtures/hello.rb:26 +msgid "Hello" +msgstr "" + #: ../test/fixtures/multi_text_domain.rb:11 ../test/fixtures/multi_text_domain.rb:24 ../test/fixtures/multi_text_domain.rb:43 ../test/fixtures/multi_text_domain.rb:50 ../test/fixtures/multi_text_domain.rb:62 ../test/fixtures/multi_text_domain.rb:75 ../test/fixtures/multi_text_domain.rb:91 ../test/fixtures/multi_text_domain.rb:104 ../test/fixtures/multi_text_domain.rb:108 ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10 ../test/test_gettext.rb:64 ../test/test_gettext.rb:297 ../test/test_gettext.rb:299 ../test/test_gettext.rb:302 ../test/test_gettext.rb:306 ../test/test_gettext.rb:309 ../test/test_gettext.rb:322 ../test/test_gettext.rb:325 ../test/test_gettext.rb:328 ../test/test_gettext.rb:336 ../test/test_gettext.rb:339 ../test/test_gettext.rb:351 ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9 ../test/test_text_domain_toplevel.rb:15 ../test/test_text_domain_toplevel.rb:18 ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23 msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/po/zh_TW/gettext.po new/po/zh_TW/gettext.po --- old/po/zh_TW/gettext.po 2015-01-20 15:54:06.000000000 +0100 +++ new/po/zh_TW/gettext.po 2015-09-22 07:16:54.000000000 +0200 @@ -478,6 +478,9 @@ msgid "duplicated" msgstr "" +msgid "Hello" +msgstr "" + msgid "language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/fixtures/hello.rb new/test/fixtures/hello.rb --- old/test/fixtures/hello.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/test/fixtures/hello.rb 2015-09-22 07:16:54.000000000 +0200 @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2015 Kouhei Sutou <kou(a)clear-code.com> +# +# License: Ruby's or LGPL +# +# This library is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This library 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 Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +require "gettext" + +class Hello + include GetText + + def hello + _("Hello") + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/po/ja/hello.po new/test/po/ja/hello.po --- old/test/po/ja/hello.po 1970-01-01 01:00:00.000000000 +0100 +++ new/test/po/ja/hello.po 2015-09-22 07:16:54.000000000 +0200 @@ -0,0 +1,21 @@ +# Japanese translations for hello package. +# Copyright (C) 2015 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the hello package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2015. +# +msgid "" +msgstr "" +"Project-Id-Version: hello 3.1.7\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2015-09-22 14:06+0900\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Japanese\n" +"Language: ja\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"\n" + +msgid "Hello" +msgstr "こんにちは" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/test_mo.rb new/test/test_mo.rb --- old/test/test_mo.rb 2015-01-20 15:54:06.000000000 +0100 +++ new/test/test_mo.rb 2015-09-22 07:16:54.000000000 +0200 @@ -19,13 +19,19 @@ assert_equal("Hello in Japanese", mo["こんにちは"]) end + def test_invalid_charset + mo = load_mo("hello.mo", "ISO-8859-1") + assert_equal("?????", mo["Hello"]) + end + def test_backslash mo = load_mo("backslash.mo") assert_equal("'\\'は'\\\\'とエスケープするべきです。", mo["You should escape '\\' as '\\\\'."]) end - def load_mo(file) - GetText::MO.open("locale/ja/LC_MESSAGES/#{file}", "UTF-8") + def load_mo(file, output_charset=nil) + output_charset ||= "UTF-8" + GetText::MO.open("locale/ja/LC_MESSAGES/#{file}", output_charset) end end

1 0

commit rubygem-highline for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '15

27 Sep '15

Hello community, here is the log from the commit of package rubygem-highline for openSUSE:Factory checked in at 2015-09-27 08:39:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-highline (Old) and /work/SRC/openSUSE:Factory/.rubygem-highline.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-highline" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-highline/rubygem-highline.changes 2015-09-17 09:20:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-highline.new/rubygem-highline.changes 2015-09-27 08:39:15.000000000 +0200 @@ -1,0 +2,18 @@ +Wed Sep 23 04:31:07 UTC 2015 - coolo(a)suse.com + +- updated to version 1.7.7 + see installed Changelog.md + + ### 1.7.7 / 2015-09-22 + * Make HighLine::Question coerce its question argument into a String. (@97-109-107 and Abinoam P. Marques Jr. (@abinoam), #159, PR #160) + +------------------------------------------------------------------- +Fri Sep 18 04:32:00 UTC 2015 - coolo(a)suse.com + +- updated to version 1.7.6 + see installed Changelog.md + + ### 1.7.6 / 2015-09-17 + * Fix a typo in a var name affecting solaris. (Danek Duvall (@dhduvall) and Abinoam P. Marques Jr. (@abinoam), #155, PR #156) + +------------------------------------------------------------------- Old: ---- highline-1.7.5.gem New: ---- highline-1.7.7.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-highline.spec ++++++ --- /var/tmp/diff_new_pack.a8G9qk/_old 2015-09-27 08:39:15.000000000 +0200 +++ /var/tmp/diff_new_pack.a8G9qk/_new 2015-09-27 08:39:15.000000000 +0200 @@ -24,7 +24,7 @@ # Name: rubygem-highline -Version: 1.7.5 +Version: 1.7.7 Release: 0 %define mod_name highline %define mod_full_name %{mod_name}-%{version} ++++++ highline-1.7.5.gem -> highline-1.7.7.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Changelog.md new/Changelog.md --- old/Changelog.md 2015-09-15 04:15:50.000000000 +0200 +++ new/Changelog.md 2015-09-23 01:19:45.000000000 +0200 @@ -2,6 +2,12 @@ Below is a complete listing of changes for each revision of HighLine. +### 1.7.7 / 2015-09-22 +* Make HighLine::Question coerce its question argument into a String. (@97-109-107 and Abinoam P. Marques Jr. (@abinoam), #159, PR #160) + +### 1.7.6 / 2015-09-17 +* Fix a typo in a var name affecting solaris. (Danek Duvall (@dhduvall) and Abinoam P. Marques Jr. (@abinoam), #155, PR #156) + ### 1.7.5 / 2015-09-14 * Support jruby9k for system extensions (Michael (@mmmries), PR #153) Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/highline/question.rb new/lib/highline/question.rb --- old/lib/highline/question.rb 2015-09-15 04:15:50.000000000 +0200 +++ new/lib/highline/question.rb 2015-09-23 01:19:45.000000000 +0200 @@ -31,7 +31,7 @@ # def initialize( question, answer_type ) # initialize instance data - @question = question.dup + @question = String(question).dup @answer_type = answer_type @completion = @answer_type diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/highline/system_extensions.rb new/lib/highline/system_extensions.rb --- old/lib/highline/system_extensions.rb 2015-09-15 04:15:50.000000000 +0200 +++ new/lib/highline/system_extensions.rb 2015-09-23 01:19:45.000000000 +0200 @@ -235,7 +235,7 @@ if /solaris/ =~ RUBY_PLATFORM and `stty` =~ /\brows = (\d+).*\bcolumns = (\d+)/ - [$2, $1].map { |c| x.to_i } + [$2, $1].map { |x| x.to_i } elsif `stty size` =~ /^(\d+)\s(\d+)$/ [$2.to_i, $1.to_i] else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/highline/version.rb new/lib/highline/version.rb --- old/lib/highline/version.rb 2015-09-15 04:15:50.000000000 +0200 +++ new/lib/highline/version.rb 2015-09-23 01:19:45.000000000 +0200 @@ -1,4 +1,4 @@ class HighLine # The version of the installed library. - VERSION = "1.7.5".freeze + VERSION = "1.7.7".freeze end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2015-09-15 04:15:50.000000000 +0200 +++ new/metadata 2015-09-23 01:19:45.000000000 +0200 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: highline version: !ruby/object:Gem::Version - version: 1.7.5 + version: 1.7.7 platform: ruby authors: - James Edward Gray II autorequire: bindir: bin cert_chain: [] -date: 2015-09-15 00:00:00.000000000 Z +date: 2015-09-22 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: code_statistics @@ -114,7 +114,7 @@ version: '0' requirements: [] rubyforge_project: highline -rubygems_version: 2.4.5 +rubygems_version: 2.4.5.1 signing_key: specification_version: 4 summary: HighLine is a high-level command-line IO library.

1 0

commit enlightenment for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '15

27 Sep '15

Hello community, here is the log from the commit of package enlightenment for openSUSE:Factory checked in at 2015-09-27 08:39:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/enlightenment (Old) and /work/SRC/openSUSE:Factory/.enlightenment.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "enlightenment" Changes: -------- --- /work/SRC/openSUSE:Factory/enlightenment/enlightenment.changes 2015-06-11 08:23:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.enlightenment.new/enlightenment.changes 2015-09-27 08:39:13.000000000 +0200 @@ -1,0 +2,158 @@ +Wed Sep 23 04:44:54 UTC 2015 - simon(a)simotek.net + +- Remove unneeded debug from spec + +------------------------------------------------------------------- +Wed Sep 23 03:23:33 UTC 2015 - simon(a)simotek.net + +- Belated changelog entry for removing some pages from the wizard + this also means set_default_system_language.patch is no longer required + +------------------------------------------------------------------- +Thu Sep 17 12:38:17 UTC 2015 - simon(a)simotek.net + +- Add network manager intergration including feature-network-manager-wizard.patch + +------------------------------------------------------------------- +Tue Sep 15 06:01:47 UTC 2015 - simon(a)simotek.net + +- bump to 0.19.10 + * Remove enlightenment-0.19.9-fix-font-loading.patch (included upstream) +Tickets Resolved: + + T1732 + T1923 + T2690 + T2703 + T2717 + +e comp - set rects to null to silence compiler warning +fix x11 compositor to use damage events +explicitly show the client object of internal window during show +force-disable refocus during desk flip on client activation +unshade clients when activating +ensure that normal clients are stacked below overrides when raising +add extreme hacks to enforce nocomp stacking policies +set 'starting' flag for desk show in e_zone_desk_count_set() +ensure that non-fullscreen nocomp clients have their layers re-set +Wizard: Update icon theme search list + +------------------------------------------------------------------- +Sun Sep 6 08:15:42 UTC 2015 - simon(a)simotek.net + +- Add enlightenment-0.19.9-fix-font-loading.patch + * Already upstream in what will become 0.19.10 and + 0.20.0 + * Currently we don't ship the icon sets e looks for + +------------------------------------------------------------------- +Sun Aug 23 11:42:06 UTC 2015 - simon(a)simotek.net + +- bump to 0.19.9 +Full Release Notes: +https://phab.enlightenment.org/phame/live/3/post/e19_9_release/ + +Tickets resolved: + + T2045 + T2127 + T2462 + T2492 + T2585 + T2645 + T2674 + T2676 + +------------------------------------------------------------------- +Thu Aug 6 06:25:11 UTC 2015 - simon(a)simotek.net + +- bump to 0.19.8 -skipped .6 - .7 + +Full release notes: +https://phab.enlightenment.org/phame/live/3/post/e19_6_release/ +https://phab.enlightenment.org/phame/live/3/post/e19_7_release/ +https://phab.enlightenment.org/phame/live/3/post/e19_8_release/ + +Tickets resolved: + 0.19.6 +T2259 +T2277 +T2411 +T2547 +T2566 +T2594 + 0.19.8 +T2071 +T2210 +T2423 +T2604 +T2642 + +Changes: +0.19.6 +passive window grabs - fix side-effect leave/enter events on clients +enlightenment: Make E build again with EFL from git +wizard: Prevent crash +wizard: Prevent crash +reject client fullscreening based on config and desk visibility +force xwindow stacking to obey nocomp policy and stack below current nocomp +allow new fullscreening clients to replace current nocomp where applicable +fix focusing client on mouse events which trigger actions (with exceptions) +fix shelf visibility state signals +fix eo errors for ilist icon select state +allow layer-blocked clients in deskmirror to restack +return an accurate value for override clients in e_comp_object_util_zone_get() +only apply deskmirror client visibility logic for non-deleted clients +stop rejecting possibly-valid x11 focus events +check for possible parent window on x11 mouse button events +fix focus FIXME regarding focus-setting on clients from other desks +unset changes.visible when forcing visibility during no-effect desk flip +add E_Client->mouse.in for determining mouse-in status +trigger fake mouse-out on clients when unsetting focus +trigger client mouse-in on x11 mouse movement for non-action clients +enforce pstate's extremely-confusing no_turbo option in cpufreq +use client window for x11 button ungrabbing +redo all x11 client mouse grabbing for focus +straggler ungrab of x11 parent window from previous commit +ensure x11 focus grabs are applied on client init when needed +only ungrab x11 windows when appropriate focus options are set +reject x11 replay clicks when event window != client window +do not apply x11 focus grabs to internal clients if efl version > 1.14 +make e_client_util_desk_visible() work for overrides without desks +make pager popups only trigger on urgency hint if client is not currently visible +set CRITICAL urgency for notification internal notifications +block client signal binding activation when mouse action is active +move E_Client->mouse.in to E_Client->mouse_in to avoid abi breakage +account for race condition when creating initial comp object updates tiler +fix compile against newer efl +move grabinput focus fix timer to x11 compositor and fix it to Work Better +always set x11 override client geometry on startup +fix compile warning +only unset e MANAGED atom on non-shutdown +only trigger client mouse-in from x11 mouse move event if client+desk are visible +ensure that focus is set and focus stack is managed on winlist hide +never use new clients for stacking part 2: the secret of the stacking +ensure clients possess comp_data before dereferencing it during x11 stacking +always stop passing key events on once they reach the lokker callback +simulate modal windows for badly behaved x11 clients + +0.19.7 +use runtime check for determining x11 compositor grab behavior +improve x11 compatibility with efl versions earlier than 1.15 + +0.19.8 +e - warning fix - fix SVID_SOURCE complaint warning +e menu - an extra object ref causes menus to never be freed +e - shelf menu - handle deletion properly if cb is not for shelf menu +allow x11 mouse wheel events to check ev->event_window for possible client match +reject x11 NotifyVirtual and NotifyInferior mouse in events +disable ecore-evas events on client windows during actions +fix build break from previous commit +use gadget zone for evry gadget launcher +add fallback loading of default theme on init +remove spurious focus setting on desk flip without animation +fix wizard module loading when E_MODULE_SRC_PATH is set +defer focus-setting on focus revert during desk flip when visibility is pending +show drag object immediately when beginning a drag + +------------------------------------------------------------------- Old: ---- enlightenment-0.19.5.tar.xz set_default_system_language.patch New: ---- enlightenment-0.19.10.tar.xz network_manager_wizard.c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ enlightenment.spec ++++++ --- /var/tmp/diff_new_pack.kVJEjQ/_old 2015-09-27 08:39:15.000000000 +0200 +++ /var/tmp/diff_new_pack.kVJEjQ/_new 2015-09-27 08:39:15.000000000 +0200 @@ -16,7 +16,7 @@ # -%define efl_version 1.11.3 +%define efl_version 1.15.0 %if 0%{?suse_version} >= 1230 || 0%{?fedora} >= 18 %define systemd_present 1 @@ -27,7 +27,7 @@ %define generate_manpages 0 Name: enlightenment -Version: 0.19.5 +Version: 0.19.10 Release: 0 Summary: The window manager License: BSD-2-Clause @@ -37,13 +37,14 @@ Source2: e17 Source3: sysactions.conf-oS12.2 Source4: sysactions.conf-systemd +# PATCH-FEATURE_OPENSUSE feature-network-manager-wizard.patch simon(a)simotek.net adds nm-applet to startup apps if its present, +# this will be maybe upstreamed when upstream network manager applet supports app indicator - (1.1.0) +Source5: network_manager_wizard.c # PATCH-FIX-OPENSUSE - enlightenment-0.16.999.65256-dont_require_suidbit.patch sleep_walker(a)suse.cz -- upstream insist on having suidbit Patch0: enlightenment-0.16.999.65256-dont_require_suidbit.patch # PATCH-FEATURE-OPENSUSE dont_offer_updates.patch -- don't offer updates, that's up to package manager -- sleep_walker(a)suse.cz Patch1: dont_offer_updates.patch -# PATCH-FEATURE-OPENSUSE set_default_system_language.patch -- use system default language and don't ask user -- sleep_walker(a)suse.cz -Patch2: set_default_system_language.patch -Patch3: %{name}-0.19.1-fix-bashisms.patch +Patch2: %{name}-0.19.1-fix-bashisms.patch BuildRequires: alsa-devel BuildRequires: autoconf BuildRequires: automake @@ -103,6 +104,10 @@ # Recommend sni-qt to make Qt4/kde4 apps work with systray Recommends: sni-qt +# Recommended to make NetworkManager Intergration work +Recommends: gnome-keyring +Recommends: NetworkManager-appindicator + Requires: enlightenment-branding = 0.1 Provides: e_module-notification = 0.2.1 @@ -178,7 +183,10 @@ %patch0 %patch1 -p1 %patch2 -p1 -%patch3 -p1 + +# Copy In new Network Wizard +rm src/modules/wizard/page_110.c +cp -v %{SOURCE5} src/modules/wizard/page_110.c %build # fake time used for documentation @@ -250,6 +258,18 @@ %endif +# Remove unwanted wizard pages +# /usr/lib64/enlightenment/modules/wizard/linux-gnu-x86_64-ver-autocannoli-0.20/page_010.so + +# Remove language / keyboard pages +rm %{buildroot}%{_libdir}/enlightenment/modules/wizard/*/page_010.so +rm %{buildroot}%{_libdir}/enlightenment/modules/wizard/*/page_011.so +# Remove connman page +rm %{buildroot}%{_libdir}/enlightenment/modules/wizard/*/page_110.so +# Don't remove Updates 170 (We have a patch to ensure its disabled) +# Remove tasks page, with our profile its not needed +rm %{buildroot}%{_libdir}/enlightenment/modules/wizard/*/page_180.so + # remove files from not wanted place rm %{buildroot}%{_datadir}/enlightenment/{COPYING,AUTHORS} ++++++ dont_offer_updates.patch ++++++ --- /var/tmp/diff_new_pack.kVJEjQ/_old 2015-09-27 08:39:15.000000000 +0200 +++ /var/tmp/diff_new_pack.kVJEjQ/_new 2015-09-27 08:39:15.000000000 +0200 @@ -1,22 +1,22 @@ Index: enlightenment-0.18.0-rc2/src/modules/wizard/page_170.c =================================================================== ---- enlightenment-0.18.0-rc2.orig/src/modules/wizard/page_170.c -+++ enlightenment-0.18.0-rc2/src/modules/wizard/page_170.c +--- a/src/modules/wizard/page_170.c ++++ b/src/modules/wizard/page_170.c @@ -1,7 +1,7 @@ /* Ask about updates checking */ #include "e_wizard.h" - + -static int do_up = 1; +static int do_up = 0; /* - EAPI int + E_API int wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__) -@@ -58,7 +58,7 @@ wizard_page_show(E_Wizard_Page *pg) +@@ -58,7 +58,7 @@ evas_object_show(of); - + e_wizard_page_show(o); - return 1; /* 1 == show ui, and wait for user, 0 == just continue */ + return 0; /* 1 == show ui, and wait for user, 0 == just continue */ } - - EAPI int + + E_API int ++++++ enlightenment-0.19.5.tar.xz -> enlightenment-0.19.10.tar.xz ++++++ /work/SRC/openSUSE:Factory/enlightenment/enlightenment-0.19.5.tar.xz /work/SRC/openSUSE:Factory/.enlightenment.new/enlightenment-0.19.10.tar.xz differ: char 26, line 1 ++++++ network_manager_wizard.c ++++++ /* Setup if we need nm-applet? */ #include "e_wizard.h" #include <stdio.h> #include <stdlib.h> #include <unistd.h> #define GNOME_KEYRING_PATH "/etc/xdg/autostart/gnome-keyring-secrets.desktop" #define NM_APPLET_PATH "/etc/xdg/autostart/nm-applet.desktop" /* E_API int wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } E_API int wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ E_API int wizard_page_show(E_Wizard_Page *pg) { // copyed from e_start_main.c char buf[16384], * home; FILE *fp; home = getenv("HOME"); if (home && (0 == access(GNOME_KEYRING_PATH, F_OK)) && (0 == access(NM_APPLET_PATH, F_OK))) { snprintf(buf, sizeof(buf), "%s/.e/e/applications/startup/.order", home); printf("%s\n", buf); fp=fopen(buf, "a+"); fprintf(fp, "%s\n%s\n", GNOME_KEYRING_PATH, NM_APPLET_PATH); fclose(fp); } return 0; /* 1 == show ui, and wait for user, 0 == just continue */ } /* E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { return 1; } E_API int wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */

1 0

commit efl for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '15

27 Sep '15

Hello community, here is the log from the commit of package efl for openSUSE:Factory checked in at 2015-09-27 08:39:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/efl (Old) and /work/SRC/openSUSE:Factory/.efl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "efl" Changes: -------- --- /work/SRC/openSUSE:Factory/efl/efl.changes 2015-09-03 18:10:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.efl.new/efl.changes 2015-09-27 08:39:10.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Sep 21 07:02:27 UTC 2015 - schwab(a)suse.de + +- Require pkgconfig(lua-5.1) instead of pkgconfig(lua) < 5.2 + +------------------------------------------------------------------- +Tue Sep 15 05:50:34 UTC 2015 - simon(a)simotek.net + +- Bump to 1.15.1 Bugfix + ecore_evas: fix first render skip in several windows + ecore-wl: do not nul terminate drops + Evas language: fix script run code (T2670) + + +------------------------------------------------------------------- Old: ---- efl-1.15.0.tar.xz New: ---- efl-1.15.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ efl.spec ++++++ --- /var/tmp/diff_new_pack.CSUGaj/_old 2015-09-27 08:39:12.000000000 +0200 +++ /var/tmp/diff_new_pack.CSUGaj/_new 2015-09-27 08:39:12.000000000 +0200 @@ -78,7 +78,7 @@ %endif Name: efl -Version: 1.15.0 +Version: 1.15.1 Release: 0 # TODO: split package to separate packages and specify licenses correctly Summary: Enlightenment Foundation Libraries - set of libraries used (not only) by Enlightenment (e17 e19) @@ -131,8 +131,12 @@ %if %luajit_present BuildRequires: pkgconfig(luajit) %else +%if 0%{suse_version} >= 1330 +BuildRequires: pkgconfig(lua-5.1) +%else BuildRequires: pkgconfig(lua) < 5.2 %endif +%endif BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(pixman-1) BuildRequires: pkgconfig(sdl) @@ -238,8 +242,12 @@ %if %luajit_present Requires: pkgconfig(luajit) %else +%if 0%{suse_version} >= 1330 +Requires: pkgconfig(lua-5.1) +%else Requires: pkgconfig(lua) < 5.2 %endif +%endif Requires: pkgconfig(openssl) Requires: pkgconfig(pixman-1) Requires: pkgconfig(sdl) ++++++ efl-1.15.0.tar.xz -> efl-1.15.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/efl/efl-1.15.0.tar.xz /work/SRC/openSUSE:Factory/.efl.new/efl-1.15.1.tar.xz differ: char 25, line 1

1 0