diff -Nru cogl-1.22.0/ABOUT-NLS cogl-1.22.2/ABOUT-NLS --- cogl-1.22.0/ABOUT-NLS 2015-09-16 14:00:36.000000000 +0000 +++ cogl-1.22.2/ABOUT-NLS 2016-08-26 17:33:37.000000000 +0000 @@ -18,35 +18,7 @@ available translations. They tell how people wanting to contribute and work on translations can contact the appropriate team. - When reporting bugs in the `intl/' directory or bugs which may be -related to internationalization, you should tell about the version of -`gettext' which is used. The information can be found in the -`intl/VERSION' file, in internationalized packages. - -1.1 Quick configuration advice -============================== - -If you want to exploit the full power of internationalization, you -should configure it using - - ./configure --with-included-gettext - -to force usage of internationalizing routines provided within this -package, despite the existence of internationalizing capabilities in the -operating system where this package is being installed. So far, only -the `gettext' implementation in the GNU C library version 2 provides as -many features (such as locale alias, message inheritance, automatic -charset conversion or plural form handling) as the implementation here. -It is also not possible to offer this additional functionality on top -of a `catgets' implementation. Future versions of GNU `gettext' will -very likely convey even more functionality. So it might be a good idea -to change to GNU `gettext' as soon as possible. - - So you need _not_ provide this option if you are using GNU libc 2 or -you have installed a recent copy of the GNU gettext package with the -included `libintl'. - -1.2 INSTALL Matters +1.1 INSTALL Matters =================== Some packages are "localizable" when properly installed; the programs @@ -56,36 +28,19 @@ By default, this package will be installed to allow translation of messages. It will automatically detect whether the system already -provides the GNU `gettext' functions. If not, the included GNU -`gettext' library will be used. This library is wholly contained -within this package, usually in the `intl/' subdirectory, so prior -installation of the GNU `gettext' package is _not_ required. -Installers may use special options at configuration time for changing -the default behaviour. The commands: +provides the GNU `gettext' functions. Installers may use special +options at configuration time for changing the default behaviour. The +command: - ./configure --with-included-gettext ./configure --disable-nls -will, respectively, bypass any pre-existing `gettext' to use the -internationalizing routines provided within this package, or else, -_totally_ disable translation of messages. +will _totally_ disable translation of messages. When you already have GNU `gettext' installed on your system and run configure without an option for your new package, `configure' will -probably detect the previously built and installed `libintl.a' file and -will decide to use this. This might not be desirable. You should use -the more recent version of the GNU `gettext' library. I.e. if the file -`intl/VERSION' shows that the library which comes with this package is -more recent, you should use - - ./configure --with-included-gettext - -to prevent auto-detection. - - The configuration process will not test for the `catgets' function -and therefore it will not be used. The reason is that even an -emulation of `gettext' on top of `catgets' could not provide all the -extensions of the GNU `gettext' library. +probably detect the previously built and installed `libintl' library +and will decide to use it. If not, you may have to to use the +`--with-libintl-prefix' option to tell `configure' where to look for it. Internationalized packages usually have many `po/LL.po' files, where LL gives an ISO 639 two-letter code identifying the language. Unless @@ -96,7 +51,7 @@ `LINGUAS' should then contain a space separated list of two-letter codes, stating which languages are allowed. -1.3 Using This Package +1.2 Using This Package ====================== As a user, if your language has been installed for this package, you @@ -148,7 +103,7 @@ to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' (Portuguese as spoken in Portugal) in this context. -1.4 Translating Teams +1.3 Translating Teams ===================== For the Free Translation Project to be a success, we need interested @@ -177,859 +132,1118 @@ the terminology in use. Proven linguistic skills are praised more than programming skills, here. -1.5 Available Packages +1.4 Available Packages ====================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of November -2007. The matrix shows, in regard of each package, for which languages +matrix shows the current state of internationalization, as of June +2010. The matrix shows, in regard of each package, for which languages PO files have been submitted to translation coordination, with a translation percentage of at least 50%. - Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB eo - +----------------------------------------------------+ - Compendium | [] [] [] [] | - a2ps | [] [] [] [] [] | - aegis | () | - ant-phone | () | - anubis | [] | - ap-utils | | - aspell | [] [] [] [] [] | - bash | [] | - bfd | | - bibshelf | [] | - binutils | | - bison | [] [] | - bison-runtime | [] | - bluez-pin | [] [] [] [] [] | - cflow | [] | - clisp | [] [] [] | - console-tools | [] [] | - coreutils | [] [] [] [] | - cpio | | - cpplib | [] [] [] | - cryptonit | [] | - dialog | | - diffutils | [] [] [] [] [] [] | - doodle | [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] | - fetchmail | [] [] () [] [] | - findutils | [] | - findutils_stable | [] [] [] | - flex | [] [] [] | - fslint | | - gas | | - gawk | [] [] [] | - gcal | [] | - gcc | [] | - gettext-examples | [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] | - gettext-tools | [] [] | - gip | [] | - gliv | [] [] | - glunarclock | [] | - gmult | [] [] | - gnubiff | () | - gnucash | [] [] () () [] | - gnuedu | | - gnulib | [] | - gnunet | | - gnunet-gtk | | - gnutls | [] | - gpe-aerial | [] [] | - gpe-beam | [] [] | - gpe-calendar | | - gpe-clock | [] [] | - gpe-conf | [] [] | - gpe-contacts | | - gpe-edit | [] | - gpe-filemanager | | - gpe-go | [] | - gpe-login | [] [] | - gpe-ownerinfo | [] [] | - gpe-package | | - gpe-sketchbook | [] [] | - gpe-su | [] [] | - gpe-taskmanager | [] [] | - gpe-timesheet | [] | - gpe-today | [] [] | - gpe-todo | | - gphoto2 | [] [] [] [] | - gprof | [] [] | - gpsdrive | | - gramadoir | [] [] | - grep | [] [] | - gretl | () | - gsasl | | - gss | | - gst-plugins-bad | [] [] | - gst-plugins-base | [] [] | - gst-plugins-good | [] [] [] | - gst-plugins-ugly | [] [] | - gstreamer | [] [] [] [] [] [] [] | - gtick | () | - gtkam | [] [] [] [] | - gtkorphan | [] [] | - gtkspell | [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] | - herrie | [] | - hylafax | | - idutils | [] [] | - indent | [] [] [] [] | - iso_15924 | | - iso_3166 | [] [] [] [] [] [] [] [] [] [] [] | - iso_3166_2 | | - iso_4217 | [] [] [] | - iso_639 | [] [] [] [] | - jpilot | [] | - jtag | | - jwhois | | - kbd | [] [] [] [] | - keytouch | [] [] | - keytouch-editor | [] | - keytouch-keyboa... | [] | - latrine | () | - ld | [] | - leafpad | [] [] [] [] [] | - libc | [] [] [] [] | - libexif | [] | - libextractor | [] | - libgpewidget | [] [] [] | - libgpg-error | [] | - libgphoto2 | [] [] | - libgphoto2_port | [] [] | - libgsasl | | - libiconv | [] [] | - libidn | [] [] [] | - lifelines | [] () | - lilypond | [] | - lingoteach | | - lprng | | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - mailfromd | | - mailutils | [] | - make | [] [] | - man-db | [] [] [] | - minicom | [] [] [] | - nano | [] [] [] | - opcodes | [] | - parted | [] [] | - pilot-qof | | - popt | [] [] [] | - psmisc | [] | - pwdutils | | - qof | | - radius | [] | - recode | [] [] [] [] [] [] | - rpm | [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] [] | - sed | [] [] [] | - shared-mime-info | [] [] [] [] () [] [] [] | - sharutils | [] [] [] [] [] [] | - shishi | | - skencil | [] () | - solfege | | - soundtracker | [] [] | - sp | [] | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] [] | - texinfo | [] [] [] | - tin | () () | - tuxpaint | [] [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - util-linux-ng | [] [] [] [] | - vorbis-tools | [] | - wastesedge | () | - wdiff | [] [] [] [] | - wget | [] [] [] | - xchat | [] [] [] [] [] [] [] | - xkeyboard-config | [] | - xpad | [] [] [] | - +----------------------------------------------------+ - af am ar az be bg bs ca cs cy da de el en en_GB eo - 6 0 2 1 8 26 2 40 48 2 56 88 15 1 15 18 - - es et eu fa fi fr ga gl gu he hi hr hu id is it + Ready PO files af am an ar as ast az be be@latin bg bn_IN bs ca +--------------------------------------------------+ - Compendium | [] [] [] [] [] | - a2ps | [] [] [] () | + a2ps | [] [] | aegis | | - ant-phone | [] | - anubis | [] | - ap-utils | [] [] | - aspell | [] [] [] | - bash | [] | - bfd | [] [] | - bibshelf | [] [] [] | - binutils | [] [] [] | - bison | [] [] [] [] [] [] | - bison-runtime | [] [] [] [] [] | - bluez-pin | [] [] [] [] [] | - cflow | [] | - clisp | [] [] | - console-tools | | - coreutils | [] [] [] [] [] [] | - cpio | [] [] [] | - cpplib | [] [] | - cryptonit | [] | - dialog | [] [] [] | - diffutils | [] [] [] [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] [] | - enscript | [] [] [] | - fetchmail | [] | - findutils | [] [] [] | - findutils_stable | [] [] [] [] | - flex | [] [] [] | - fslint | | - gas | [] [] | - gawk | [] [] [] [] () | - gcal | [] [] | - gcc | [] | - gettext-examples | [] [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] | - gettext-tools | [] [] [] [] | - gip | [] [] [] [] | - gliv | () | - glunarclock | [] [] [] | - gmult | [] [] [] | - gnubiff | () () | - gnucash | () () () | - gnuedu | [] | - gnulib | [] [] [] | - gnunet | | - gnunet-gtk | | - gnutls | | - gpe-aerial | [] [] | - gpe-beam | [] [] | - gpe-calendar | | - gpe-clock | [] [] [] [] | - gpe-conf | [] | - gpe-contacts | [] [] | - gpe-edit | [] [] [] [] | - gpe-filemanager | [] | - gpe-go | [] [] [] | - gpe-login | [] [] [] | - gpe-ownerinfo | [] [] [] [] [] | - gpe-package | [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] [] [] | - gpe-taskmanager | [] [] [] | - gpe-timesheet | [] [] [] [] | - gpe-today | [] [] [] [] | - gpe-todo | [] | - gphoto2 | [] [] [] [] [] | - gprof | [] [] [] [] [] | - gpsdrive | [] | - gramadoir | [] [] | - grep | [] [] [] | - gretl | [] [] [] () | - gsasl | [] [] | - gss | [] [] | - gst-plugins-bad | [] [] [] [] | - gst-plugins-base | [] [] [] [] | - gst-plugins-good | [] [] [] [] [] | - gst-plugins-ugly | [] [] [] [] | - gstreamer | [] [] [] | - gtick | [] [] [] | - gtkam | [] [] [] [] | - gtkorphan | [] [] | - gtkspell | [] [] [] [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | - herrie | [] | - hylafax | | - idutils | [] [] [] [] [] | - indent | [] [] [] [] [] [] [] [] [] [] | - iso_15924 | [] | - iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] | - iso_3166_2 | [] | - iso_4217 | [] [] [] [] [] [] | - iso_639 | [] [] [] [] [] [] | - jpilot | [] [] | - jtag | [] | - jwhois | [] [] [] [] [] | - kbd | [] [] | - keytouch | [] [] [] | - keytouch-editor | [] | - keytouch-keyboa... | [] [] | - latrine | [] [] | - ld | [] [] [] [] | - leafpad | [] [] [] [] [] [] | - libc | [] [] [] [] [] | - libexif | [] | - libextractor | [] | - libgpewidget | [] [] [] [] [] | - libgpg-error | [] | - libgphoto2 | [] [] [] | - libgphoto2_port | [] [] | - libgsasl | [] [] | - libiconv | [] [] [] | - libidn | [] [] | - lifelines | () | - lilypond | [] [] [] | - lingoteach | [] [] [] | - lprng | | - lynx | [] [] [] | - m4 | [] [] [] [] | - mailfromd | | - mailutils | [] [] | - make | [] [] [] [] [] [] [] [] | - man-db | [] | - minicom | [] [] [] [] | - nano | [] [] [] [] [] [] [] | - opcodes | [] [] [] [] | - parted | [] [] [] | - pilot-qof | | - popt | [] [] [] [] | - psmisc | [] [] | - pwdutils | | - qof | [] | - radius | [] [] | - recode | [] [] [] [] [] [] [] [] | - rpm | [] [] | - screem | | - scrollkeeper | [] [] [] | - sed | [] [] [] [] [] | - shared-mime-info | [] [] [] [] [] [] | - sharutils | [] [] [] [] [] [] [] [] | - shishi | [] | - skencil | [] [] | - solfege | [] | - soundtracker | [] [] [] | - sp | [] | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] [] [] [] [] | - texinfo | [] [] [] | - tin | [] () | - tuxpaint | [] [] | - unicode-han-tra... | | - unicode-transla... | [] [] | - util-linux | [] [] [] [] [] [] [] | - util-linux-ng | [] [] [] [] [] [] [] | - vorbis-tools | | - wastesedge | () | - wdiff | [] [] [] [] [] [] [] [] | - wget | [] [] [] [] [] [] [] [] | - xchat | [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] [] | - xpad | [] [] [] | - +--------------------------------------------------+ - es et eu fa fi fr ga gl gu he hi hr hu id is it - 85 22 14 2 48 101 61 12 2 8 2 6 53 29 1 52 - - ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn - +--------------------------------------------------+ - Compendium | [] | - a2ps | () [] [] | - aegis | () | - ant-phone | [] | - anubis | [] [] [] | - ap-utils | [] | - aspell | [] [] | - bash | [] | + ant-phone | | + anubis | | + aspell | [] [] | + bash | | bfd | | - bibshelf | [] | + bibshelf | [] | binutils | | - bison | [] [] [] | - bison-runtime | [] [] [] | - bluez-pin | [] [] [] | + bison | | + bison-runtime | [] | + bluez-pin | [] [] | + bombono-dvd | | + buzztard | | cflow | | - clisp | [] | - console-tools | | - coreutils | [] | - cpio | [] | - cpplib | [] | - cryptonit | [] | - dialog | [] [] | - diffutils | [] [] [] | + clisp | | + coreutils | [] [] | + cpio | | + cppi | | + cpplib | [] | + cryptsetup | | + dfarc | | + dialog | [] [] | + dico | | + diffutils | [] | + dink | | doodle | | - e2fsprogs | [] | - enscript | [] | - fetchmail | [] [] | - findutils | [] | - findutils_stable | [] | - flex | [] [] | - fslint | | + e2fsprogs | [] | + enscript | [] | + exif | | + fetchmail | [] | + findutils | [] | + flex | [] | + freedink | | gas | | - gawk | [] [] | - gcal | | + gawk | [] [] | + gcal | [] | gcc | | - gettext-examples | [] [] [] | - gettext-runtime | [] [] [] | - gettext-tools | [] [] | - gip | [] [] | - gliv | [] | - glunarclock | [] [] | - gmult | [] [] [] | + gettext-examples | [] [] [] [] | + gettext-runtime | [] [] | + gettext-tools | [] [] | + gip | [] | + gjay | | + gliv | [] | + glunarclock | [] [] | gnubiff | | - gnucash | () () () | + gnucash | [] | gnuedu | | - gnulib | [] [] | + gnulib | | gnunet | | gnunet-gtk | | - gnutls | [] | - gpe-aerial | [] | - gpe-beam | [] | - gpe-calendar | [] | - gpe-clock | [] [] [] | - gpe-conf | [] [] [] | - gpe-contacts | [] | - gpe-edit | [] [] [] | - gpe-filemanager | [] [] | - gpe-go | [] [] [] | - gpe-login | [] [] [] | - gpe-ownerinfo | [] [] | - gpe-package | [] [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] [] | - gpe-taskmanager | [] [] [] [] | - gpe-timesheet | [] | - gpe-today | [] [] | - gpe-todo | [] | - gphoto2 | [] [] | - gprof | [] | - gpsdrive | [] | - gramadoir | () | - grep | [] [] | - gretl | | - gsasl | [] | + gnutls | | + gold | | + gpe-aerial | | + gpe-beam | | + gpe-bluetooth | | + gpe-calendar | | + gpe-clock | [] | + gpe-conf | | + gpe-contacts | | + gpe-edit | | + gpe-filemanager | | + gpe-go | | + gpe-login | | + gpe-ownerinfo | [] | + gpe-package | | + gpe-sketchbook | | + gpe-su | [] | + gpe-taskmanager | [] | + gpe-timesheet | [] | + gpe-today | [] | + gpe-todo | | + gphoto2 | | + gprof | [] | + gpsdrive | | + gramadoir | | + grep | | + grub | [] [] | + gsasl | | gss | | - gst-plugins-bad | [] | - gst-plugins-base | [] | - gst-plugins-good | [] | - gst-plugins-ugly | [] | - gstreamer | [] | - gtick | [] | - gtkam | [] [] | - gtkorphan | [] | - gtkspell | [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] | - herrie | [] | + gst-plugins-bad | [] | + gst-plugins-base | [] | + gst-plugins-good | [] | + gst-plugins-ugly | [] | + gstreamer | [] [] [] | + gtick | | + gtkam | [] | + gtkorphan | [] | + gtkspell | [] [] [] | + gutenprint | | + hello | [] | + help2man | | hylafax | | - idutils | [] | - indent | [] [] | - iso_15924 | [] | - iso_3166 | [] [] [] [] [] [] [] [] | - iso_3166_2 | [] | - iso_4217 | [] [] [] | - iso_639 | [] [] [] [] | - jpilot | () () | - jtag | | - jwhois | [] | - kbd | [] | - keytouch | [] | - keytouch-editor | [] | - keytouch-keyboa... | | - latrine | [] | - ld | | - leafpad | [] [] | - libc | [] [] [] | - libexif | | + idutils | | + indent | [] [] | + iso_15924 | | + iso_3166 | [] [] [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | | + iso_639 | [] [] [] [] | + iso_639_3 | | + jwhois | | + kbd | | + keytouch | [] | + keytouch-editor | | + keytouch-keyboa... | [] | + klavaro | [] | + latrine | | + ld | [] | + leafpad | [] [] | + libc | [] [] | + libexif | () | libextractor | | - libgpewidget | [] | + libgnutls | | + libgpewidget | | libgpg-error | | - libgphoto2 | [] | - libgphoto2_port | [] | - libgsasl | [] | - libiconv | [] | - libidn | [] [] | - lifelines | [] | - lilypond | [] | - lingoteach | [] | + libgphoto2 | | + libgphoto2_port | | + libgsasl | | + libiconv | [] | + libidn | | + lifelines | | + liferea | [] [] | + lilypond | | + linkdr | [] | + lordsawar | | lprng | | - lynx | [] [] | - m4 | [] [] | + lynx | [] | + m4 | | mailfromd | | mailutils | | - make | [] [] [] | + make | | man-db | | - minicom | [] | - nano | [] [] [] | - opcodes | [] | - parted | [] [] | - pilot-qof | | - popt | [] [] [] | - psmisc | [] [] [] | + man-db-manpages | | + minicom | | + mkisofs | | + myserver | | + nano | [] [] | + opcodes | | + parted | | + pies | | + popt | | + psmisc | | + pspp | [] | pwdutils | | - qof | | - radius | | - recode | [] | - rpm | [] [] | - screem | [] | - scrollkeeper | [] [] [] [] | - sed | [] [] | - shared-mime-info | [] [] [] [] [] [] [] | - sharutils | [] [] | + radius | [] | + recode | [] [] | + rosegarden | | + rpm | | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] [] | + sed | [] [] | + sharutils | [] [] | shishi | | skencil | | - solfege | () () | + solfege | | + solfege-manual | | soundtracker | | - sp | () | - system-tools-ba... | [] [] [] [] | - tar | [] [] [] | - texinfo | [] [] | + sp | | + sysstat | | + tar | [] | + texinfo | | tin | | - tuxpaint | () [] [] | unicode-han-tra... | | unicode-transla... | | - util-linux | [] [] | - util-linux-ng | [] [] | + util-linux-ng | [] | + vice | | + vmm | | vorbis-tools | | - wastesedge | [] | - wdiff | [] [] | - wget | [] [] | - xchat | [] [] [] [] | - xkeyboard-config | [] [] [] | - xpad | [] [] [] | - +--------------------------------------------------+ - ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn - 51 2 25 3 2 0 6 0 2 2 20 0 11 1 103 6 - - or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - +--------------------------------------------------+ - Compendium | [] [] [] [] [] | - a2ps | () [] [] [] [] [] [] | - aegis | () () | - ant-phone | [] [] | - anubis | [] [] [] | - ap-utils | () | - aspell | [] [] [] | - bash | [] [] | - bfd | | - bibshelf | [] | - binutils | [] [] | - bison | [] [] [] [] [] | - bison-runtime | [] [] [] [] [] | - bluez-pin | [] [] [] [] [] [] [] [] [] | - cflow | [] | - clisp | [] | - console-tools | [] | - coreutils | [] [] [] [] | - cpio | [] [] [] | - cpplib | [] | - cryptonit | [] [] | - dialog | [] | - diffutils | [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] [] | - fetchmail | [] [] [] | - findutils | [] [] [] | - findutils_stable | [] [] [] [] [] [] | - flex | [] [] [] [] [] | - fslint | [] | - gas | | - gawk | [] [] [] [] | - gcal | [] | - gcc | [] [] | - gettext-examples | [] [] [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] [] [] | - gettext-tools | [] [] [] [] [] [] [] | - gip | [] [] [] [] | - gliv | [] [] [] [] [] [] | - glunarclock | [] [] [] [] [] [] | - gmult | [] [] [] [] | - gnubiff | () [] | - gnucash | () [] | - gnuedu | | - gnulib | [] [] [] | - gnunet | | - gnunet-gtk | [] | - gnutls | [] [] | - gpe-aerial | [] [] [] [] [] [] [] | - gpe-beam | [] [] [] [] [] [] [] | - gpe-calendar | [] [] [] [] | - gpe-clock | [] [] [] [] [] [] [] [] | - gpe-conf | [] [] [] [] [] [] [] | - gpe-contacts | [] [] [] [] [] | - gpe-edit | [] [] [] [] [] [] [] [] [] | - gpe-filemanager | [] [] | - gpe-go | [] [] [] [] [] [] [] [] | - gpe-login | [] [] [] [] [] [] [] [] | - gpe-ownerinfo | [] [] [] [] [] [] [] [] | - gpe-package | [] [] | - gpe-sketchbook | [] [] [] [] [] [] [] [] | - gpe-su | [] [] [] [] [] [] [] [] | - gpe-taskmanager | [] [] [] [] [] [] [] [] | - gpe-timesheet | [] [] [] [] [] [] [] [] | - gpe-today | [] [] [] [] [] [] [] [] | - gpe-todo | [] [] [] [] | - gphoto2 | [] [] [] [] [] [] | - gprof | [] [] [] | - gpsdrive | [] [] | - gramadoir | [] [] | - grep | [] [] [] [] | - gretl | [] [] [] | - gsasl | [] [] [] | - gss | [] [] [] [] | - gst-plugins-bad | [] [] [] | - gst-plugins-base | [] [] | - gst-plugins-good | [] [] | - gst-plugins-ugly | [] [] [] | - gstreamer | [] [] [] [] | - gtick | [] | - gtkam | [] [] [] [] [] | - gtkorphan | [] | - gtkspell | [] [] [] [] [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] [] | - herrie | [] [] [] | - hylafax | | - idutils | [] [] [] [] [] | - indent | [] [] [] [] [] [] [] | - iso_15924 | | - iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] | - iso_3166_2 | | - iso_4217 | [] [] [] [] [] [] [] | - iso_639 | [] [] [] [] [] [] [] | - jpilot | | - jtag | [] | - jwhois | [] [] [] [] | - kbd | [] [] [] | - keytouch | [] | - keytouch-editor | [] | - keytouch-keyboa... | [] | - latrine | | - ld | [] | - leafpad | [] [] [] [] [] [] | - libc | [] [] [] [] | - libexif | [] [] | - libextractor | [] [] | - libgpewidget | [] [] [] [] [] [] [] [] | - libgpg-error | [] [] [] | - libgphoto2 | [] | - libgphoto2_port | [] [] [] | - libgsasl | [] [] [] [] | - libiconv | [] [] [] | - libidn | [] [] () | - lifelines | [] [] | - lilypond | | - lingoteach | [] | - lprng | [] | - lynx | [] [] [] | - m4 | [] [] [] [] [] | - mailfromd | [] | - mailutils | [] [] [] | - make | [] [] [] [] | - man-db | [] [] [] [] | - minicom | [] [] [] [] [] | - nano | [] [] [] [] | - opcodes | [] [] | - parted | [] | - pilot-qof | | - popt | [] [] [] [] | - psmisc | [] [] | - pwdutils | [] [] | - qof | [] [] | - radius | [] [] | - recode | [] [] [] [] [] [] [] | - rpm | [] [] [] [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] | - sed | [] [] [] [] [] [] [] [] [] | - shared-mime-info | [] [] [] [] [] [] | - sharutils | [] [] [] [] | - shishi | [] | - skencil | [] [] [] | - solfege | [] | - soundtracker | [] [] | - sp | | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] [] [] [] | - texinfo | [] [] [] [] | - tin | () | - tuxpaint | [] [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - util-linux-ng | [] [] [] [] | - vorbis-tools | [] | wastesedge | | - wdiff | [] [] [] [] [] [] [] | - wget | [] [] [] [] | - xchat | [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] | - xpad | [] [] [] | + wdiff | | + wget | [] [] | + wyslij-po | | + xchat | [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] | +--------------------------------------------------+ - or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - 0 5 77 31 53 4 58 72 3 45 46 9 45 122 3 + af am an ar as ast az be be@latin bg bn_IN bs ca + 6 0 1 2 3 19 1 10 3 28 3 1 38 + + crh cs da de el en en_GB en_ZA eo es et eu fa + +-------------------------------------------------+ + a2ps | [] [] [] [] [] [] [] | + aegis | [] [] [] | + ant-phone | [] () | + anubis | [] [] | + aspell | [] [] [] [] [] | + bash | [] [] [] | + bfd | [] | + bibshelf | [] [] [] | + binutils | [] | + bison | [] [] | + bison-runtime | [] [] [] [] | + bluez-pin | [] [] [] [] [] [] | + bombono-dvd | [] | + buzztard | [] [] [] | + cflow | [] [] | + clisp | [] [] [] [] | + coreutils | [] [] [] [] | + cpio | | + cppi | | + cpplib | [] [] [] | + cryptsetup | [] | + dfarc | [] [] [] | + dialog | [] [] [] [] [] | + dico | | + diffutils | [] [] [] [] [] [] | + dink | [] [] [] | + doodle | [] | + e2fsprogs | [] [] [] | + enscript | [] [] [] | + exif | () [] [] | + fetchmail | [] [] () [] [] [] | + findutils | [] [] [] | + flex | [] [] | + freedink | [] [] [] | + gas | [] | + gawk | [] [] [] | + gcal | [] | + gcc | [] [] | + gettext-examples | [] [] [] [] | + gettext-runtime | [] [] [] [] | + gettext-tools | [] [] [] | + gip | [] [] [] [] | + gjay | [] | + gliv | [] [] [] | + glunarclock | [] [] | + gnubiff | () | + gnucash | [] () () () () | + gnuedu | [] [] | + gnulib | [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] | + gold | [] | + gpe-aerial | [] [] [] [] | + gpe-beam | [] [] [] [] | + gpe-bluetooth | [] [] | + gpe-calendar | [] | + gpe-clock | [] [] [] [] | + gpe-conf | [] [] [] | + gpe-contacts | [] [] [] | + gpe-edit | [] [] | + gpe-filemanager | [] [] [] | + gpe-go | [] [] [] [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] [] [] | + gpe-package | [] [] [] | + gpe-sketchbook | [] [] [] [] | + gpe-su | [] [] [] [] | + gpe-taskmanager | [] [] [] [] | + gpe-timesheet | [] [] [] [] | + gpe-today | [] [] [] [] | + gpe-todo | [] [] [] | + gphoto2 | [] [] () [] [] [] | + gprof | [] [] [] | + gpsdrive | [] [] [] | + gramadoir | [] [] [] | + grep | [] | + grub | [] [] | + gsasl | [] | + gss | | + gst-plugins-bad | [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] | + gtick | [] () [] | + gtkam | [] [] () [] [] | + gtkorphan | [] [] [] [] | + gtkspell | [] [] [] [] [] [] [] | + gutenprint | [] [] [] | + hello | [] [] [] [] | + help2man | [] | + hylafax | [] [] | + idutils | [] [] | + indent | [] [] [] [] [] [] [] | + iso_15924 | [] () [] [] | + iso_3166 | [] [] [] [] () [] [] [] () | + iso_3166_2 | () | + iso_4217 | [] [] [] () [] [] | + iso_639 | [] [] [] [] () [] [] | + iso_639_3 | [] | + jwhois | [] | + kbd | [] [] [] [] [] | + keytouch | [] [] | + keytouch-editor | [] [] | + keytouch-keyboa... | [] | + klavaro | [] [] [] [] | + latrine | [] () | + ld | [] [] | + leafpad | [] [] [] [] [] [] | + libc | [] [] [] [] | + libexif | [] [] () | + libextractor | | + libgnutls | [] | + libgpewidget | [] [] | + libgpg-error | [] [] | + libgphoto2 | [] () | + libgphoto2_port | [] () [] | + libgsasl | | + libiconv | [] [] [] [] [] | + libidn | [] [] [] | + lifelines | [] () | + liferea | [] [] [] [] [] | + lilypond | [] [] [] | + linkdr | [] [] [] | + lordsawar | [] | + lprng | | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailfromd | | + mailutils | [] | + make | [] [] [] | + man-db | | + man-db-manpages | | + minicom | [] [] [] [] | + mkisofs | | + myserver | | + nano | [] [] [] | + opcodes | [] [] | + parted | [] [] | + pies | | + popt | [] [] [] [] [] | + psmisc | [] [] [] | + pspp | [] | + pwdutils | [] | + radius | [] | + recode | [] [] [] [] [] [] | + rosegarden | () () () | + rpm | [] [] [] | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] [] [] [] | + sed | [] [] [] [] [] [] | + sharutils | [] [] [] [] | + shishi | | + skencil | [] () [] | + solfege | [] [] [] | + solfege-manual | [] [] | + soundtracker | [] [] [] | + sp | [] | + sysstat | [] [] [] | + tar | [] [] [] [] | + texinfo | [] [] [] | + tin | [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | [] [] [] [] | + vice | () () | + vmm | [] | + vorbis-tools | [] [] | + wastesedge | [] | + wdiff | [] [] | + wget | [] [] [] | + wyslij-po | | + xchat | [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] [] [] | + +-------------------------------------------------+ + crh cs da de el en en_GB en_ZA eo es et eu fa + 5 64 105 117 18 1 8 0 28 89 18 19 0 + + fi fr ga gl gu he hi hr hu hy id is it ja ka kn + +----------------------------------------------------+ + a2ps | [] [] [] [] | + aegis | [] [] | + ant-phone | [] [] | + anubis | [] [] [] [] | + aspell | [] [] [] [] | + bash | [] [] [] [] | + bfd | [] [] [] | + bibshelf | [] [] [] [] [] | + binutils | [] [] [] | + bison | [] [] [] [] | + bison-runtime | [] [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] [] | + bombono-dvd | [] | + buzztard | [] | + cflow | [] [] [] | + clisp | [] | + coreutils | [] [] [] [] [] | + cpio | [] [] [] [] | + cppi | [] [] | + cpplib | [] [] [] | + cryptsetup | [] [] [] | + dfarc | [] [] [] | + dialog | [] [] [] [] [] [] [] | + dico | | + diffutils | [] [] [] [] [] [] [] [] [] | + dink | [] | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] | + exif | [] [] [] [] [] [] | + fetchmail | [] [] [] [] | + findutils | [] [] [] [] [] [] | + flex | [] [] [] | + freedink | [] [] [] | + gas | [] [] | + gawk | [] [] [] [] () [] | + gcal | [] | + gcc | [] | + gettext-examples | [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] | + gettext-tools | [] [] [] [] | + gip | [] [] [] [] [] [] | + gjay | [] | + gliv | [] () | + glunarclock | [] [] [] [] | + gnubiff | () [] () | + gnucash | () () () () () [] | + gnuedu | [] [] | + gnulib | [] [] [] [] [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] | + gold | [] [] | + gpe-aerial | [] [] [] | + gpe-beam | [] [] [] [] | + gpe-bluetooth | [] [] [] [] | + gpe-calendar | [] [] | + gpe-clock | [] [] [] [] [] | + gpe-conf | [] [] [] [] | + gpe-contacts | [] [] [] [] | + gpe-edit | [] [] [] | + gpe-filemanager | [] [] [] [] | + gpe-go | [] [] [] [] [] | + gpe-login | [] [] [] | + gpe-ownerinfo | [] [] [] [] [] | + gpe-package | [] [] [] | + gpe-sketchbook | [] [] [] [] | + gpe-su | [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] | + gpe-timesheet | [] [] [] [] [] | + gpe-today | [] [] [] [] [] [] [] | + gpe-todo | [] [] [] | + gphoto2 | [] [] [] [] [] [] | + gprof | [] [] [] [] | + gpsdrive | [] [] [] | + gramadoir | [] [] [] | + grep | [] [] | + grub | [] [] [] [] | + gsasl | [] [] [] [] [] | + gss | [] [] [] [] [] | + gst-plugins-bad | [] [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] | + gtick | [] [] [] [] [] | + gtkam | [] [] [] [] [] | + gtkorphan | [] [] [] | + gtkspell | [] [] [] [] [] [] [] [] [] | + gutenprint | [] [] [] [] | + hello | [] [] [] | + help2man | [] [] | + hylafax | [] | + idutils | [] [] [] [] [] [] | + indent | [] [] [] [] [] [] [] [] | + iso_15924 | [] () [] [] | + iso_3166 | [] () [] [] [] [] [] [] [] [] [] [] | + iso_3166_2 | () [] [] [] | + iso_4217 | [] () [] [] [] [] | + iso_639 | [] () [] [] [] [] [] [] [] | + iso_639_3 | () [] [] | + jwhois | [] [] [] [] [] | + kbd | [] [] | + keytouch | [] [] [] [] [] [] | + keytouch-editor | [] [] [] [] [] | + keytouch-keyboa... | [] [] [] [] [] | + klavaro | [] [] | + latrine | [] [] [] | + ld | [] [] [] [] | + leafpad | [] [] [] [] [] [] [] () | + libc | [] [] [] [] [] | + libexif | [] | + libextractor | | + libgnutls | [] [] | + libgpewidget | [] [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] [] [] | + libgphoto2_port | [] [] [] | + libgsasl | [] [] [] [] [] | + libiconv | [] [] [] [] [] [] | + libidn | [] [] [] [] | + lifelines | () | + liferea | [] [] [] [] | + lilypond | [] [] | + linkdr | [] [] [] [] [] | + lordsawar | | + lprng | [] | + lynx | [] [] [] [] [] | + m4 | [] [] [] [] [] [] | + mailfromd | | + mailutils | [] [] | + make | [] [] [] [] [] [] [] [] [] | + man-db | [] [] | + man-db-manpages | [] | + minicom | [] [] [] [] [] | + mkisofs | [] [] [] [] | + myserver | | + nano | [] [] [] [] [] [] | + opcodes | [] [] [] [] | + parted | [] [] [] [] | + pies | | + popt | [] [] [] [] [] [] [] [] [] | + psmisc | [] [] [] | + pspp | | + pwdutils | [] [] | + radius | [] [] | + recode | [] [] [] [] [] [] [] [] | + rosegarden | () () () () () | + rpm | [] [] | + rush | | + sarg | [] | + screem | [] [] | + scrollkeeper | [] [] [] [] | + sed | [] [] [] [] [] [] [] [] | + sharutils | [] [] [] [] [] [] [] | + shishi | [] | + skencil | [] | + solfege | [] [] [] [] | + solfege-manual | [] [] | + soundtracker | [] [] | + sp | [] () | + sysstat | [] [] [] [] [] | + tar | [] [] [] [] [] [] [] | + texinfo | [] [] [] [] | + tin | [] | + unicode-han-tra... | | + unicode-transla... | [] [] | + util-linux-ng | [] [] [] [] [] [] | + vice | () () () | + vmm | [] | + vorbis-tools | [] | + wastesedge | () () | + wdiff | [] | + wget | [] [] [] [] [] [] [] [] | + wyslij-po | [] [] [] | + xchat | [] [] [] [] [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] [] | + +----------------------------------------------------+ + fi fr ga gl gu he hi hr hu hy id is it ja ka kn + 105 121 53 20 4 8 3 5 53 2 120 5 84 67 0 4 + + ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne + +-----------------------------------------------+ + a2ps | [] | + aegis | | + ant-phone | | + anubis | [] [] | + aspell | [] | + bash | | + bfd | | + bibshelf | [] [] | + binutils | | + bison | [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] | + bombono-dvd | | + buzztard | | + cflow | | + clisp | | + coreutils | [] | + cpio | | + cppi | | + cpplib | | + cryptsetup | | + dfarc | [] | + dialog | [] [] [] [] [] | + dico | | + diffutils | [] [] | + dink | | + doodle | | + e2fsprogs | | + enscript | | + exif | [] | + fetchmail | | + findutils | | + flex | | + freedink | [] | + gas | | + gawk | | + gcal | | + gcc | | + gettext-examples | [] [] [] [] | + gettext-runtime | [] | + gettext-tools | [] | + gip | [] [] | + gjay | | + gliv | | + glunarclock | [] | + gnubiff | | + gnucash | () () () () | + gnuedu | | + gnulib | | + gnunet | | + gnunet-gtk | | + gnutls | [] | + gold | | + gpe-aerial | [] | + gpe-beam | [] | + gpe-bluetooth | [] [] | + gpe-calendar | [] | + gpe-clock | [] [] [] [] [] | + gpe-conf | [] [] | + gpe-contacts | [] [] | + gpe-edit | [] | + gpe-filemanager | [] [] | + gpe-go | [] [] [] | + gpe-login | [] | + gpe-ownerinfo | [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] [] | + gpe-timesheet | [] [] | + gpe-today | [] [] [] [] | + gpe-todo | [] [] | + gphoto2 | | + gprof | [] | + gpsdrive | | + gramadoir | | + grep | | + grub | | + gsasl | | + gss | | + gst-plugins-bad | [] [] [] [] | + gst-plugins-base | [] [] | + gst-plugins-good | [] [] | + gst-plugins-ugly | [] [] [] [] [] | + gstreamer | | + gtick | | + gtkam | [] | + gtkorphan | [] [] | + gtkspell | [] [] [] [] [] [] [] | + gutenprint | | + hello | [] [] [] | + help2man | | + hylafax | | + idutils | | + indent | | + iso_15924 | [] [] | + iso_3166 | [] [] () [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | [] [] | + iso_639 | [] [] | + iso_639_3 | [] | + jwhois | [] | + kbd | | + keytouch | [] | + keytouch-editor | [] | + keytouch-keyboa... | [] | + klavaro | [] | + latrine | [] | + ld | | + leafpad | [] [] [] | + libc | [] | + libexif | | + libextractor | | + libgnutls | [] | + libgpewidget | [] [] | + libgpg-error | | + libgphoto2 | | + libgphoto2_port | | + libgsasl | | + libiconv | | + libidn | | + lifelines | | + liferea | | + lilypond | | + linkdr | | + lordsawar | | + lprng | | + lynx | | + m4 | | + mailfromd | | + mailutils | | + make | [] | + man-db | | + man-db-manpages | | + minicom | [] | + mkisofs | | + myserver | | + nano | [] [] | + opcodes | | + parted | | + pies | | + popt | [] [] [] | + psmisc | | + pspp | | + pwdutils | | + radius | | + recode | | + rosegarden | | + rpm | | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] | + sed | | + sharutils | | + shishi | | + skencil | | + solfege | [] | + solfege-manual | | + soundtracker | | + sp | | + sysstat | [] | + tar | [] | + texinfo | [] | + tin | | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | | + vice | | + vmm | | + vorbis-tools | | + wastesedge | | + wdiff | | + wget | [] | + wyslij-po | | + xchat | [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + +-----------------------------------------------+ + ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne + 20 5 10 1 13 48 4 2 2 4 24 10 20 3 1 + + nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr + +---------------------------------------------------+ + a2ps | [] [] [] [] [] [] [] [] | + aegis | [] [] [] | + ant-phone | [] [] | + anubis | [] [] [] | + aspell | [] [] [] [] [] | + bash | [] [] | + bfd | [] | + bibshelf | [] [] | + binutils | [] [] | + bison | [] [] [] | + bison-runtime | [] [] [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] [] | + bombono-dvd | [] () | + buzztard | [] [] | + cflow | [] | + clisp | [] [] | + coreutils | [] [] [] [] [] [] | + cpio | [] [] [] | + cppi | [] | + cpplib | [] | + cryptsetup | [] | + dfarc | [] | + dialog | [] [] [] [] | + dico | [] | + diffutils | [] [] [] [] [] [] | + dink | () | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] [] | + exif | [] [] [] () [] | + fetchmail | [] [] [] [] | + findutils | [] [] [] [] [] | + flex | [] [] [] [] [] | + freedink | [] [] | + gas | | + gawk | [] [] [] [] | + gcal | | + gcc | [] | + gettext-examples | [] [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] [] [] [] | + gettext-tools | [] [] [] [] [] [] | + gip | [] [] [] [] [] | + gjay | | + gliv | [] [] [] [] [] [] | + glunarclock | [] [] [] [] [] | + gnubiff | [] () | + gnucash | [] () () () | + gnuedu | [] | + gnulib | [] [] [] [] | + gnunet | | + gnunet-gtk | | + gnutls | [] [] | + gold | | + gpe-aerial | [] [] [] [] [] [] [] | + gpe-beam | [] [] [] [] [] [] [] | + gpe-bluetooth | [] [] | + gpe-calendar | [] [] [] [] | + gpe-clock | [] [] [] [] [] [] [] [] | + gpe-conf | [] [] [] [] [] [] [] | + gpe-contacts | [] [] [] [] [] | + gpe-edit | [] [] [] | + gpe-filemanager | [] [] [] | + gpe-go | [] [] [] [] [] [] [] [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] [] [] [] [] [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] [] [] [] [] [] | + gpe-su | [] [] [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] [] [] [] | + gpe-timesheet | [] [] [] [] [] [] [] [] | + gpe-today | [] [] [] [] [] [] [] [] | + gpe-todo | [] [] [] [] [] | + gphoto2 | [] [] [] [] [] [] [] [] | + gprof | [] [] [] | + gpsdrive | [] [] | + gramadoir | [] [] | + grep | [] [] [] [] | + grub | [] [] [] | + gsasl | [] [] [] [] | + gss | [] [] [] | + gst-plugins-bad | [] [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] | + gtick | [] [] [] | + gtkam | [] [] [] [] [] [] | + gtkorphan | [] | + gtkspell | [] [] [] [] [] [] [] [] [] [] | + gutenprint | [] [] | + hello | [] [] [] [] | + help2man | [] [] | + hylafax | [] | + idutils | [] [] [] [] [] | + indent | [] [] [] [] [] [] [] | + iso_15924 | [] [] [] [] | + iso_3166 | [] [] [] [] [] () [] [] [] [] [] [] [] [] | + iso_3166_2 | [] [] [] | + iso_4217 | [] [] [] [] [] [] [] [] | + iso_639 | [] [] [] [] [] [] [] [] [] | + iso_639_3 | [] [] | + jwhois | [] [] [] [] | + kbd | [] [] [] | + keytouch | [] [] [] | + keytouch-editor | [] [] [] | + keytouch-keyboa... | [] [] [] | + klavaro | [] [] | + latrine | [] [] | + ld | | + leafpad | [] [] [] [] [] [] [] [] [] | + libc | [] [] [] [] | + libexif | [] [] () [] | + libextractor | | + libgnutls | [] [] | + libgpewidget | [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] [] | + libgphoto2_port | [] [] [] [] [] | + libgsasl | [] [] [] [] [] | + libiconv | [] [] [] [] [] | + libidn | [] [] | + lifelines | [] [] | + liferea | [] [] [] [] [] () () [] | + lilypond | [] | + linkdr | [] [] [] | + lordsawar | | + lprng | [] | + lynx | [] [] [] | + m4 | [] [] [] [] [] | + mailfromd | [] | + mailutils | [] | + make | [] [] [] [] | + man-db | [] [] [] | + man-db-manpages | [] [] [] | + minicom | [] [] [] [] | + mkisofs | [] [] [] | + myserver | | + nano | [] [] [] [] | + opcodes | [] [] | + parted | [] [] [] [] | + pies | [] | + popt | [] [] [] [] | + psmisc | [] [] [] | + pspp | [] [] | + pwdutils | [] | + radius | [] [] [] | + recode | [] [] [] [] [] [] [] [] | + rosegarden | () () | + rpm | [] [] [] | + rush | [] [] | + sarg | | + screem | | + scrollkeeper | [] [] [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] [] [] | + sharutils | [] [] [] [] | + shishi | [] | + skencil | [] [] | + solfege | [] [] [] [] | + solfege-manual | [] [] [] | + soundtracker | [] | + sp | | + sysstat | [] [] [] [] | + tar | [] [] [] [] | + texinfo | [] [] [] [] | + tin | [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | [] [] [] [] [] | + vice | [] | + vmm | [] | + vorbis-tools | [] [] | + wastesedge | [] | + wdiff | [] [] | + wget | [] [] [] [] [] [] [] | + wyslij-po | [] [] [] | + xchat | [] [] [] [] [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + +---------------------------------------------------+ + nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr + 135 10 4 7 105 1 29 62 47 91 3 54 46 9 37 - tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu + sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW +---------------------------------------------------+ - Compendium | [] [] [] [] | 19 - a2ps | [] [] [] | 19 - aegis | [] | 1 - ant-phone | [] [] | 6 - anubis | [] [] [] | 11 - ap-utils | () [] | 4 - aspell | [] [] [] | 16 - bash | [] | 6 - bfd | | 2 - bibshelf | [] | 7 - binutils | [] [] [] [] | 9 - bison | [] [] [] [] | 20 - bison-runtime | [] [] [] [] | 18 - bluez-pin | [] [] [] [] [] [] | 28 - cflow | [] [] | 5 - clisp | | 9 - console-tools | [] [] | 5 - coreutils | [] [] [] | 18 - cpio | [] [] [] [] | 11 - cpplib | [] [] [] [] [] | 12 - cryptonit | [] | 6 - dialog | [] [] [] | 9 - diffutils | [] [] [] [] [] | 29 - doodle | [] | 6 - e2fsprogs | [] [] | 10 - enscript | [] [] [] | 16 - fetchmail | [] [] | 12 - findutils | [] [] [] | 11 - findutils_stable | [] [] [] [] | 18 - flex | [] [] | 15 - fslint | [] | 2 - gas | [] | 3 - gawk | [] [] [] | 16 - gcal | [] | 5 - gcc | [] [] [] | 7 - gettext-examples | [] [] [] [] [] [] | 29 - gettext-runtime | [] [] [] [] [] [] | 28 - gettext-tools | [] [] [] [] [] | 20 - gip | [] [] | 13 - gliv | [] [] | 11 - glunarclock | [] [] [] | 15 - gmult | [] [] [] [] | 16 - gnubiff | [] | 2 - gnucash | () [] | 5 - gnuedu | [] | 2 - gnulib | [] | 10 - gnunet | | 0 - gnunet-gtk | [] [] | 3 - gnutls | | 4 - gpe-aerial | [] [] | 14 - gpe-beam | [] [] | 14 - gpe-calendar | [] [] | 7 - gpe-clock | [] [] [] [] | 21 - gpe-conf | [] [] [] | 16 - gpe-contacts | [] [] | 10 - gpe-edit | [] [] [] [] [] | 22 - gpe-filemanager | [] [] | 7 - gpe-go | [] [] [] [] | 19 - gpe-login | [] [] [] [] [] | 21 - gpe-ownerinfo | [] [] [] [] | 21 - gpe-package | [] | 6 - gpe-sketchbook | [] [] | 16 - gpe-su | [] [] [] [] | 21 - gpe-taskmanager | [] [] [] [] | 21 - gpe-timesheet | [] [] [] [] | 18 - gpe-today | [] [] [] [] [] | 21 - gpe-todo | [] [] | 8 - gphoto2 | [] [] [] [] | 21 - gprof | [] [] | 13 - gpsdrive | [] | 5 - gramadoir | [] | 7 - grep | [] | 12 - gretl | | 6 - gsasl | [] [] [] | 9 - gss | [] | 7 - gst-plugins-bad | [] [] [] | 13 - gst-plugins-base | [] [] | 11 - gst-plugins-good | [] [] [] [] [] | 16 - gst-plugins-ugly | [] [] [] | 13 - gstreamer | [] [] [] | 18 - gtick | [] [] | 7 - gtkam | [] | 16 - gtkorphan | [] | 7 - gtkspell | [] [] [] [] [] [] | 27 - gutenprint | | 4 - hello | [] [] [] [] [] | 38 - herrie | [] [] | 8 - hylafax | | 0 - idutils | [] [] | 15 - indent | [] [] [] [] [] | 28 - iso_15924 | [] [] | 4 - iso_3166 | [] [] [] [] [] [] [] [] [] | 54 - iso_3166_2 | [] [] | 4 - iso_4217 | [] [] [] [] [] | 24 - iso_639 | [] [] [] [] [] | 26 - jpilot | [] [] [] [] | 7 - jtag | [] | 3 - jwhois | [] [] [] | 13 - kbd | [] [] [] | 13 - keytouch | [] | 8 - keytouch-editor | [] | 5 - keytouch-keyboa... | [] | 5 - latrine | [] [] | 5 - ld | [] [] [] [] | 10 - leafpad | [] [] [] [] [] | 24 - libc | [] [] [] | 19 - libexif | [] | 5 - libextractor | [] | 5 - libgpewidget | [] [] [] | 20 - libgpg-error | [] | 6 - libgphoto2 | [] [] | 9 - libgphoto2_port | [] [] [] | 11 - libgsasl | [] | 8 - libiconv | [] [] | 11 - libidn | [] [] | 11 - lifelines | | 4 - lilypond | [] | 6 - lingoteach | [] | 6 - lprng | [] | 2 - lynx | [] [] [] | 15 - m4 | [] [] [] | 18 - mailfromd | [] [] | 3 - mailutils | [] [] | 8 - make | [] [] [] | 20 - man-db | [] | 9 - minicom | [] | 14 - nano | [] [] [] | 20 - opcodes | [] [] | 10 - parted | [] [] [] | 11 - pilot-qof | [] | 1 - popt | [] [] [] [] | 18 - psmisc | [] [] | 10 - pwdutils | [] | 3 - qof | [] | 4 - radius | [] [] | 7 - recode | [] [] [] | 25 - rpm | [] [] [] [] | 13 - screem | [] | 2 - scrollkeeper | [] [] [] [] | 26 - sed | [] [] [] [] | 23 - shared-mime-info | [] [] [] | 29 - sharutils | [] [] [] | 23 - shishi | [] | 3 - skencil | [] | 7 - solfege | [] | 3 - soundtracker | [] [] | 9 - sp | [] | 3 - system-tools-ba... | [] [] [] [] [] [] [] | 38 - tar | [] [] [] | 17 - texinfo | [] [] [] | 15 - tin | | 1 - tuxpaint | [] [] [] | 19 + a2ps | [] [] [] [] [] | 27 + aegis | [] | 9 + ant-phone | [] [] [] [] | 9 + anubis | [] [] [] [] | 15 + aspell | [] [] [] | 20 + bash | [] [] [] | 12 + bfd | [] | 6 + bibshelf | [] [] [] | 16 + binutils | [] [] | 8 + bison | [] [] | 12 + bison-runtime | [] [] [] [] [] [] | 29 + bluez-pin | [] [] [] [] [] [] [] [] | 37 + bombono-dvd | [] | 4 + buzztard | [] | 7 + cflow | [] [] [] | 9 + clisp | | 10 + coreutils | [] [] [] [] | 22 + cpio | [] [] [] [] [] [] | 13 + cppi | [] [] | 5 + cpplib | [] [] [] [] [] [] | 14 + cryptsetup | [] [] | 7 + dfarc | [] | 9 + dialog | [] [] [] [] [] [] [] | 30 + dico | [] | 2 + diffutils | [] [] [] [] [] [] | 30 + dink | | 4 + doodle | [] [] | 7 + e2fsprogs | [] [] [] | 11 + enscript | [] [] [] [] | 17 + exif | [] [] [] | 16 + fetchmail | [] [] [] | 17 + findutils | [] [] [] [] [] | 20 + flex | [] [] [] [] | 15 + freedink | [] | 10 + gas | [] | 4 + gawk | [] [] [] [] | 18 + gcal | [] [] | 5 + gcc | [] [] [] | 7 + gettext-examples | [] [] [] [] [] [] [] | 34 + gettext-runtime | [] [] [] [] [] [] [] | 29 + gettext-tools | [] [] [] [] [] [] | 22 + gip | [] [] [] [] | 22 + gjay | [] | 3 + gliv | [] [] [] | 14 + glunarclock | [] [] [] [] [] | 19 + gnubiff | [] [] | 4 + gnucash | () [] () [] () | 10 + gnuedu | [] [] | 7 + gnulib | [] [] [] [] | 16 + gnunet | [] | 1 + gnunet-gtk | [] [] [] | 5 + gnutls | [] [] [] | 10 + gold | [] | 4 + gpe-aerial | [] [] [] | 18 + gpe-beam | [] [] [] | 19 + gpe-bluetooth | [] [] [] | 13 + gpe-calendar | [] [] [] [] | 12 + gpe-clock | [] [] [] [] [] | 28 + gpe-conf | [] [] [] [] | 20 + gpe-contacts | [] [] [] | 17 + gpe-edit | [] [] [] | 12 + gpe-filemanager | [] [] [] [] | 16 + gpe-go | [] [] [] [] [] | 25 + gpe-login | [] [] [] | 11 + gpe-ownerinfo | [] [] [] [] [] | 25 + gpe-package | [] [] [] | 13 + gpe-sketchbook | [] [] [] | 20 + gpe-su | [] [] [] [] [] | 30 + gpe-taskmanager | [] [] [] [] [] | 29 + gpe-timesheet | [] [] [] [] [] | 25 + gpe-today | [] [] [] [] [] [] | 30 + gpe-todo | [] [] [] [] | 17 + gphoto2 | [] [] [] [] [] | 24 + gprof | [] [] [] | 15 + gpsdrive | [] [] [] | 11 + gramadoir | [] [] [] | 11 + grep | [] [] [] | 10 + grub | [] [] [] | 14 + gsasl | [] [] [] [] | 14 + gss | [] [] [] | 11 + gst-plugins-bad | [] [] [] [] | 26 + gst-plugins-base | [] [] [] [] [] | 24 + gst-plugins-good | [] [] [] [] | 24 + gst-plugins-ugly | [] [] [] [] [] | 29 + gstreamer | [] [] [] [] | 22 + gtick | [] [] [] | 13 + gtkam | [] [] [] | 20 + gtkorphan | [] [] [] | 14 + gtkspell | [] [] [] [] [] [] [] [] [] | 45 + gutenprint | [] | 10 + hello | [] [] [] [] [] [] | 21 + help2man | [] [] | 7 + hylafax | [] | 5 + idutils | [] [] [] [] | 17 + indent | [] [] [] [] [] [] | 30 + iso_15924 | () [] () [] [] | 16 + iso_3166 | [] [] () [] [] () [] [] [] () | 53 + iso_3166_2 | () [] () [] | 9 + iso_4217 | [] () [] [] () [] [] | 26 + iso_639 | [] [] [] () [] () [] [] [] [] | 38 + iso_639_3 | [] () | 8 + jwhois | [] [] [] [] [] | 16 + kbd | [] [] [] [] [] | 15 + keytouch | [] [] [] | 16 + keytouch-editor | [] [] [] | 14 + keytouch-keyboa... | [] [] [] | 14 + klavaro | [] | 11 + latrine | [] [] [] | 10 + ld | [] [] [] [] | 11 + leafpad | [] [] [] [] [] [] | 33 + libc | [] [] [] [] [] | 21 + libexif | [] () | 7 + libextractor | [] | 1 + libgnutls | [] [] [] | 9 + libgpewidget | [] [] [] | 14 + libgpg-error | [] [] [] | 9 + libgphoto2 | [] [] | 8 + libgphoto2_port | [] [] [] [] | 14 + libgsasl | [] [] [] | 13 + libiconv | [] [] [] [] | 21 + libidn | () [] [] | 11 + lifelines | [] | 4 + liferea | [] [] [] | 21 + lilypond | [] | 7 + linkdr | [] [] [] [] [] | 17 + lordsawar | | 1 + lprng | [] | 3 + lynx | [] [] [] [] | 17 + m4 | [] [] [] [] | 19 + mailfromd | [] [] | 3 + mailutils | [] | 5 + make | [] [] [] [] | 21 + man-db | [] [] [] | 8 + man-db-manpages | | 4 + minicom | [] [] | 16 + mkisofs | [] [] | 9 + myserver | | 0 + nano | [] [] [] [] | 21 + opcodes | [] [] [] | 11 + parted | [] [] [] [] [] | 15 + pies | [] [] | 3 + popt | [] [] [] [] [] [] | 27 + psmisc | [] [] | 11 + pspp | | 4 + pwdutils | [] [] | 6 + radius | [] [] | 9 + recode | [] [] [] [] | 28 + rosegarden | () | 0 + rpm | [] [] [] | 11 + rush | [] [] | 4 + sarg | | 1 + screem | [] | 3 + scrollkeeper | [] [] [] [] [] | 27 + sed | [] [] [] [] [] | 30 + sharutils | [] [] [] [] [] | 22 + shishi | [] | 3 + skencil | [] [] | 7 + solfege | [] [] [] [] | 16 + solfege-manual | [] | 8 + soundtracker | [] [] [] | 9 + sp | [] | 3 + sysstat | [] [] | 15 + tar | [] [] [] [] [] [] | 23 + texinfo | [] [] [] [] [] | 17 + tin | | 4 unicode-han-tra... | | 0 unicode-transla... | | 2 - util-linux | [] [] [] | 20 - util-linux-ng | [] [] [] | 20 - vorbis-tools | [] [] | 4 - wastesedge | | 1 - wdiff | [] [] | 23 - wget | [] [] [] | 20 - xchat | [] [] [] [] | 29 - xkeyboard-config | [] [] [] | 14 - xpad | [] [] [] | 15 + util-linux-ng | [] [] [] [] | 20 + vice | () () | 1 + vmm | [] | 4 + vorbis-tools | [] | 6 + wastesedge | | 2 + wdiff | [] [] | 7 + wget | [] [] [] [] [] | 26 + wyslij-po | [] [] | 8 + xchat | [] [] [] [] [] [] | 36 + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] | 63 + xkeyboard-config | [] [] [] | 22 +---------------------------------------------------+ - 76 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu - 163 domains 0 3 1 74 51 0 143 21 1 57 7 45 0 2036 + 85 teams sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW + 178 domains 119 1 3 3 0 10 65 51 155 17 98 7 41 2618 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -1042,12 +1256,12 @@ lag between the mere existence a PO file and its wide availability in a distribution. - If November 2007 seems to be old, you may fetch a more recent copy -of this `ABOUT-NLS' file on most GNU archive sites. The most -up-to-date matrix with full percentage details can be found at + If June 2010 seems to be old, you may fetch a more recent copy of +this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date +matrix with full percentage details can be found at `http://translationproject.org/extra/matrix.html'. -1.6 Using `gettext' in new packages +1.5 Using `gettext' in new packages =================================== If you are writing a freely available program and want to diff -Nru cogl-1.22.0/aclocal.m4 cogl-1.22.2/aclocal.m4 --- cogl-1.22.0/aclocal.m4 2015-09-16 14:00:49.000000000 +0000 +++ cogl-1.22.2/aclocal.m4 2016-08-26 17:33:55.000000000 +0000 @@ -20,32 +20,63 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29) +dnl +dnl Copyright © 2004 Scott James Remnant . +dnl Copyright © 2012-2015 Dan Nicholson +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) @@ -67,18 +98,19 @@ PKG_CONFIG="" fi fi[]dnl -])# PKG_PROG_PKG_CONFIG +])dnl PKG_PROG_PKG_CONFIG -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ @@ -88,8 +120,10 @@ $3])dnl fi]) -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. m4_define([_PKG_CONFIG], [if test -n "$$1"; then pkg_cv_[]$1="$$1" @@ -101,10 +135,11 @@ else pkg_failed=untried fi[]dnl -])# _PKG_CONFIG +])dnl _PKG_CONFIG -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -112,19 +147,17 @@ else _pkg_short_errors_supported=no fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +])dnl _PKG_SHORT_ERRORS_SUPPORTED -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac AC_DEFUN([PKG_CHECK_MODULES], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl @@ -178,16 +211,40 @@ AC_MSG_RESULT([yes]) $3 fi[]dnl -])# PKG_CHECK_MODULES +])dnl PKG_CHECK_MODULES -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. AC_DEFUN([PKG_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -198,16 +255,18 @@ AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR +])dnl PKG_INSTALLDIR -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. AC_DEFUN([PKG_NOARCH_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -218,13 +277,15 @@ AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR +])dnl PKG_NOARCH_INSTALLDIR -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. AC_DEFUN([PKG_CHECK_VAR], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl @@ -233,7 +294,7 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR +])dnl PKG_CHECK_VAR # Configure paths for GLIB # Owen Taylor 1997-2001 @@ -1161,38 +1222,6 @@ fi ]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for 'mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl FIXME we are no longer going to remove this! adjust warning -dnl FIXME message accordingly. -AC_DIAGNOSE([obsolete], -[$0: this macro is deprecated, and will soon be removed. -You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead, -and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.]) -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- # Copyright (C) 2001-2014 Free Software Foundation, Inc. diff -Nru cogl-1.22.0/build/autotools/gettext.m4 cogl-1.22.2/build/autotools/gettext.m4 --- cogl-1.22.0/build/autotools/gettext.m4 2015-09-16 14:00:37.000000000 +0000 +++ cogl-1.22.2/build/autotools/gettext.m4 2016-08-26 17:33:37.000000000 +0000 @@ -1,5 +1,5 @@ -# gettext.m4 serial 60 (gettext-0.17) -dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. +# gettext.m4 serial 66 (gettext-0.18.2) +dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -15,7 +15,7 @@ dnl Authors: dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2006. +dnl Bruno Haible , 2000-2006, 2008-2010. dnl Macro to add for using GNU gettext. @@ -35,7 +35,7 @@ dnl 'need-formatstring-macros', then GNU gettext implementations that don't dnl support the ISO C 99 formatstring macros will be ignored. dnl INTLDIR is used to find the intl libraries. If empty, -dnl the value `$(top_builddir)/intl/' is used. +dnl the value '$(top_builddir)/intl/' is used. dnl dnl The result of the configuration is one of three cases: dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled @@ -60,6 +60,8 @@ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT ])])])])]) + ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old], + [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])]) ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ])])])]) @@ -95,7 +97,7 @@ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) ]) - dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. + dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation. gt_INTL_MACOSX dnl Set USE_NLS. @@ -123,11 +125,11 @@ gt_use_preinstalled_gnugettext=no ifelse(gt_included_intl, yes, [ AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, + AC_ARG_WITH([included-gettext], [ --with-included-gettext use the GNU gettext library included here], nls_cv_force_use_gnu_gettext=$withval, nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext]) nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then @@ -155,12 +157,18 @@ fi AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], - [AC_TRY_LINK([#include + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include $gt_revision_test_code extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings;], - [bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings], +extern int *_nl_domain_bindings; + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings + ]])], [eval "$gt_func_gnugettext_libc=yes"], [eval "$gt_func_gnugettext_libc=no"])]) @@ -181,35 +189,47 @@ gt_save_LIBS="$LIBS" LIBS="$LIBS $LIBINTL" dnl Now see whether libintl exists and does not depend on libiconv. - AC_TRY_LINK([#include + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include $gt_revision_test_code extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias (const char *);], - [bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], +const char *_nl_expand_alias (const char *); + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") + ]])], [eval "$gt_func_gnugettext_libintl=yes"], [eval "$gt_func_gnugettext_libintl=no"]) dnl Now see whether libintl exists and depends on libiconv. if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include $gt_revision_test_code extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias (const char *);], - [bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], - [LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" - eval "$gt_func_gnugettext_libintl=yes" - ]) +const char *_nl_expand_alias (const char *); + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") + ]])], + [LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + eval "$gt_func_gnugettext_libintl=yes" + ]) fi CPPFLAGS="$gt_save_CPPFLAGS" LIBS="$gt_save_LIBS"]) @@ -267,7 +287,7 @@ if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then - AC_DEFINE(ENABLE_NLS, 1, + AC_DEFINE([ENABLE_NLS], [1], [Define to 1 if translation of program messages to the user's native language is requested.]) else @@ -301,9 +321,9 @@ fi dnl For backward compatibility. Some packages may be using this. - AC_DEFINE(HAVE_GETTEXT, 1, + AC_DEFINE([HAVE_GETTEXT], [1], [Define if the GNU gettext() function is already present or preinstalled.]) - AC_DEFINE(HAVE_DCGETTEXT, 1, + AC_DEFINE([HAVE_DCGETTEXT], [1], [Define if the GNU dcgettext() function is already present or preinstalled.]) fi @@ -319,9 +339,9 @@ fi dnl Make all variables we use known to autoconf. - AC_SUBST(BUILD_INCLUDED_LIBINTL) - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATOBJEXT) + AC_SUBST([BUILD_INCLUDED_LIBINTL]) + AC_SUBST([USE_INCLUDED_LIBINTL]) + AC_SUBST([CATOBJEXT]) dnl For backward compatibility. Some configure.ins may be using this. nls_cv_header_intl= @@ -329,36 +349,36 @@ dnl For backward compatibility. Some Makefiles may be using this. DATADIRNAME=share - AC_SUBST(DATADIRNAME) + AC_SUBST([DATADIRNAME]) dnl For backward compatibility. Some Makefiles may be using this. INSTOBJEXT=.mo - AC_SUBST(INSTOBJEXT) + AC_SUBST([INSTOBJEXT]) dnl For backward compatibility. Some Makefiles may be using this. GENCAT=gencat - AC_SUBST(GENCAT) + AC_SUBST([GENCAT]) dnl For backward compatibility. Some Makefiles may be using this. INTLOBJS= if test "$USE_INCLUDED_LIBINTL" = yes; then INTLOBJS="\$(GETTOBJS)" fi - AC_SUBST(INTLOBJS) + AC_SUBST([INTLOBJS]) dnl Enable libtool support if the surrounding package wishes it. INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix - AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) + AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX]) ]) dnl For backward compatibility. Some Makefiles may be using this. INTLLIBS="$LIBINTL" - AC_SUBST(INTLLIBS) + AC_SUBST([INTLLIBS]) dnl Make all documented variables known to autoconf. - AC_SUBST(LIBINTL) - AC_SUBST(LTLIBINTL) - AC_SUBST(POSUB) + AC_SUBST([LIBINTL]) + AC_SUBST([LTLIBINTL]) + AC_SUBST([POSUB]) ]) diff -Nru cogl-1.22.0/build/autotools/iconv.m4 cogl-1.22.2/build/autotools/iconv.m4 --- cogl-1.22.0/build/autotools/iconv.m4 2015-09-16 14:00:37.000000000 +0000 +++ cogl-1.22.2/build/autotools/iconv.m4 2016-08-26 17:33:37.000000000 +0000 @@ -1,5 +1,5 @@ -# iconv.m4 serial AM6 (gettext-0.17) -dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc. +# iconv.m4 serial 18 (gettext-0.18.2) +dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -30,44 +30,55 @@ dnl Add $INCICONV to CPPFLAGS before performing the following checks, dnl because if the user has installed libiconv and not disabled its use dnl via --without-libiconv-prefix, he wants to use it. The first - dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. + dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed. am_save_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) - AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [ + AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_func_iconv=yes) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#include + ]], + [[iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);]])], + [am_cv_func_iconv=yes]) if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#include + ]], + [[iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);]])], + [am_cv_lib_iconv=yes] + [am_cv_func_iconv=yes]) LIBS="$am_save_LIBS" fi ]) if test "$am_cv_func_iconv" = yes; then - AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [ - dnl This tests against bugs in AIX 5.1 and HP-UX 11.11. + AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ + dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11, + dnl Solaris 10. am_save_LIBS="$LIBS" if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi - AC_TRY_RUN([ + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ #include #include int main () { + int result = 0; /* Test against AIX 5.1 bug: Failures are not distinguishable from successful returns. */ { @@ -84,7 +95,47 @@ (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) - return 1; + result |= 1; + iconv_close (cd_utf8_to_88591); + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\263"; + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 2; + iconv_close (cd_ascii_to_88591); + } + } + /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static const char input[] = "\304"; + static char buf[2] = { (char)0xDE, (char)0xAD }; + const char *inptr = input; + size_t inbytesleft = 1; + char *outptr = buf; + size_t outbytesleft = 1; + size_t res = iconv (cd_88591_to_utf8, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) + result |= 4; + iconv_close (cd_88591_to_utf8); } } #if 0 /* This bug could be worked around by the caller. */ @@ -103,7 +154,8 @@ (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if ((int)res > 0) - return 1; + result |= 8; + iconv_close (cd_88591_to_utf8); } } #endif @@ -117,13 +169,19 @@ && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) /* Try HP-UX names. */ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) - return 1; - return 0; -}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], - [case "$host_os" in + result |= 16; + return result; +}]])], + [am_cv_func_iconv_works=yes], + [am_cv_func_iconv_works=no], + [ +changequote(,)dnl + case "$host_os" in aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; *) am_cv_func_iconv_works="guessing yes" ;; - esac]) + esac +changequote([,])dnl + ]) LIBS="$am_save_LIBS" ]) case "$am_cv_func_iconv_works" in @@ -134,7 +192,7 @@ am_func_iconv=no am_cv_lib_iconv=no fi if test "$am_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, + AC_DEFINE([HAVE_ICONV], [1], [Define if you have the iconv() function and it works.]) fi if test "$am_cv_lib_iconv" = yes; then @@ -147,34 +205,64 @@ LIBICONV= LTLIBICONV= fi - AC_SUBST(LIBICONV) - AC_SUBST(LTLIBICONV) + AC_SUBST([LIBICONV]) + AC_SUBST([LTLIBICONV]) ]) -AC_DEFUN([AM_ICONV], +dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to +dnl avoid warnings like +dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". +dnl This is tricky because of the way 'aclocal' is implemented: +dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. +dnl Otherwise aclocal's initial scan pass would miss the macro definition. +dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. +dnl Otherwise aclocal would emit many "Use of uninitialized value $1" +dnl warnings. +m4_define([gl_iconv_AC_DEFUN], + m4_version_prereq([2.64], + [[AC_DEFUN_ONCE( + [$1], [$2])]], + [m4_ifdef([gl_00GNULIB], + [[AC_DEFUN_ONCE( + [$1], [$2])]], + [[AC_DEFUN( + [$1], [$2])]])])) +gl_iconv_AC_DEFUN([AM_ICONV], [ AM_ICONV_LINK if test "$am_cv_func_iconv" = yes; then AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL(am_cv_proto_iconv, [ - AC_TRY_COMPILE([ + AC_CACHE_VAL([am_cv_proto_iconv], [ + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ #include #include extern #ifdef __cplusplus "C" #endif -#if defined(__STDC__) || defined(__cplusplus) +#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); #else size_t iconv(); #endif -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") + ]], + [[]])], + [am_cv_proto_iconv_arg1=""], + [am_cv_proto_iconv_arg1="const"]) am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([$]{ac_t:- - }[$]am_cv_proto_iconv) - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, + AC_MSG_RESULT([ + $am_cv_proto_iconv]) + AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], [Define as const if the declaration of iconv() needs const.]) + dnl Also substitute ICONV_CONST in the gnulib generated . + m4_ifdef([gl_ICONV_H_DEFAULTS], + [AC_REQUIRE([gl_ICONV_H_DEFAULTS]) + if test -n "$am_cv_proto_iconv_arg1"; then + ICONV_CONST="const" + fi + ]) fi ]) diff -Nru cogl-1.22.0/build/autotools/intlmacosx.m4 cogl-1.22.2/build/autotools/intlmacosx.m4 --- cogl-1.22.0/build/autotools/intlmacosx.m4 2015-09-16 14:00:37.000000000 +0000 +++ cogl-1.22.2/build/autotools/intlmacosx.m4 2016-08-26 17:33:37.000000000 +0000 @@ -1,5 +1,5 @@ -# intlmacosx.m4 serial 1 (gettext-0.17) -dnl Copyright (C) 2004-2007 Free Software Foundation, Inc. +# intlmacosx.m4 serial 5 (gettext-0.18.2) +dnl Copyright (C) 2004-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,35 +13,40 @@ dnl gettext package package is covered by the GNU General Public License. dnl They are *not* in the public domain. -dnl Checks for special options needed on MacOS X. +dnl Checks for special options needed on Mac OS X. dnl Defines INTL_MACOSX_LIBS. AC_DEFUN([gt_INTL_MACOSX], [ - dnl Check for API introduced in MacOS X 10.2. + dnl Check for API introduced in Mac OS X 10.2. AC_CACHE_CHECK([for CFPreferencesCopyAppValue], - gt_cv_func_CFPreferencesCopyAppValue, + [gt_cv_func_CFPreferencesCopyAppValue], [gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include ], - [CFPreferencesCopyAppValue(NULL, NULL)], + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFPreferencesCopyAppValue(NULL, NULL)]])], [gt_cv_func_CFPreferencesCopyAppValue=yes], [gt_cv_func_CFPreferencesCopyAppValue=no]) LIBS="$gt_save_LIBS"]) if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, - [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], + [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) fi - dnl Check for API introduced in MacOS X 10.3. - AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, + dnl Check for API introduced in Mac OS X 10.3. + AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], [gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include ], [CFLocaleCopyCurrent();], + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFLocaleCopyCurrent();]])], [gt_cv_func_CFLocaleCopyCurrent=yes], [gt_cv_func_CFLocaleCopyCurrent=no]) LIBS="$gt_save_LIBS"]) if test $gt_cv_func_CFLocaleCopyCurrent = yes; then - AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, - [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) + AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], + [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) fi INTL_MACOSX_LIBS= if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then diff -Nru cogl-1.22.0/build/autotools/lib-ld.m4 cogl-1.22.2/build/autotools/lib-ld.m4 --- cogl-1.22.0/build/autotools/lib-ld.m4 2015-09-16 14:00:37.000000000 +0000 +++ cogl-1.22.2/build/autotools/lib-ld.m4 2016-08-26 17:33:37.000000000 +0000 @@ -1,50 +1,56 @@ -# lib-ld.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. +# lib-ld.m4 serial 6 +dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. +dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid +dnl collision with libtool.m4. -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. +dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no. AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], +[# I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) + AC_MSG_CHECKING([for ld used by $CC]) case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -54,12 +60,12 @@ esac case $ac_prog in # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` + while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; @@ -77,33 +83,36 @@ else AC_MSG_CHECKING([for non-GNU ld]) fi -AC_CACHE_VAL(acl_cv_path_LD, +AC_CACHE_VAL([acl_cv_path_LD], [if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do + IFS="$acl_save_ifs" test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then acl_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + case `"$acl_cv_path_LD" -v 2>&1 conftest.sh . ./conftest.sh @@ -131,11 +147,32 @@ acl_hardcode_direct="$acl_cv_hardcode_direct" acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE(rpath, + AC_ARG_ENABLE([rpath], [ --disable-rpath do not hardcode runtime library paths], :, enable_rpath=yes) ]) +dnl AC_LIB_FROMPACKAGE(name, package) +dnl declares that libname comes from the given package. The configure file +dnl will then not have a --with-libname-prefix option but a +dnl --with-package-prefix option. Several libraries can come from the same +dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar +dnl macro call that searches for libname. +AC_DEFUN([AC_LIB_FROMPACKAGE], +[ + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) + define([acl_frompackage_]NAME, [$2]) + popdef([NAME]) + pushdef([PACK],[$2]) + pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) + define([acl_libsinpackage_]PACKUP, + m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1]) + popdef([PACKUP]) + popdef([PACK]) +]) + dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and dnl the libraries corresponding to explicit and implicit dependencies. dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. @@ -144,19 +181,23 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], [ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) + pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) + pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) + pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) dnl Autoconf >= 2.61 supports dots in --with options. - define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])]) + pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)]) dnl By default, look in $includedir and $libdir. use_additional=yes AC_LIB_WITH_FINAL_PREFIX([ eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" ]) - AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix], -[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib - --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir], + AC_ARG_WITH(P_A_C_K[-prefix], +[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib + --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], [ if test "X$withval" = "Xno"; then use_additional=no @@ -169,6 +210,10 @@ else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi ]) @@ -178,6 +223,9 @@ LTLIB[]NAME= INC[]NAME= LIB[]NAME[]_PREFIX= + dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been + dnl computed. So it has to be reset here. + HAVE_LIB[]NAME= rpathdirs= ltrpathdirs= names_already_handled= @@ -197,7 +245,7 @@ names_already_handled="$names_already_handled $name" dnl See if it was already located by an earlier AC_LIB_LINKFLAGS dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` eval value=\"\$HAVE_LIB$uppername\" if test -n "$value"; then if test "$value" = yes; then @@ -327,7 +375,9 @@ dnl Linking with a shared library. We attempt to hardcode its dnl directory into the executable's runpath, unless it's the dnl standard /usr/lib. - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then dnl No hardcoding is needed. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" else @@ -415,7 +465,16 @@ case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - LIB[]NAME[]_PREFIX="$basedir" + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac @@ -476,9 +535,11 @@ dnl 3. if it's already present in $LDFLAGS or the already dnl constructed $LIBNAME, dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -609,6 +670,11 @@ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" done fi + popdef([P_A_C_K]) + popdef([PACKLIBS]) + popdef([PACKUP]) + popdef([PACK]) + popdef([NAME]) ]) dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, @@ -654,7 +720,8 @@ if test -n "$next"; then dir="$next" dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem"; then + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then rpathdirs="$rpathdirs $dir" fi next= @@ -663,7 +730,8 @@ -L) next=yes ;; -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem"; then + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then rpathdirs="$rpathdirs $dir" fi next= ;; diff -Nru cogl-1.22.0/build/autotools/lib-prefix.m4 cogl-1.22.2/build/autotools/lib-prefix.m4 --- cogl-1.22.0/build/autotools/lib-prefix.m4 2015-09-16 14:00:37.000000000 +0000 +++ cogl-1.22.2/build/autotools/lib-prefix.m4 2016-08-26 17:33:37.000000000 +0000 @@ -1,5 +1,5 @@ -# lib-prefix.m4 serial 5 (gettext-0.15) -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. +# lib-prefix.m4 serial 7 (gettext-0.18) +dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -153,33 +153,72 @@ prefix="$acl_save_prefix" ]) -dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing -dnl the basename of the libdir, either "lib" or "lib64". +dnl AC_LIB_PREPARE_MULTILIB creates +dnl - a variable acl_libdirstem, containing the basename of the libdir, either +dnl "lib" or "lib64" or "lib/64", +dnl - a variable acl_libdirstem2, as a secondary possible value for +dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or +dnl "lib/amd64". AC_DEFUN([AC_LIB_PREPARE_MULTILIB], [ - dnl There is no formal standard regarding lib and lib64. The current - dnl practice is that on a system supporting 32-bit and 64-bit instruction - dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit - dnl libraries go under $prefix/lib. We determine the compiler's default - dnl mode by looking at the compiler's library search path. If at least - dnl of its elements ends in /lib64 or points to a directory whose absolute - dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the - dnl default, namely "lib". + dnl There is no formal standard regarding lib and lib64. + dnl On glibc systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine + dnl the compiler's default mode by looking at the compiler's library search + dnl path. If at least one of its elements ends in /lib64 or points to a + dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI. + dnl Otherwise we use the default, namely "lib". + dnl On Solaris systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or + dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. + AC_REQUIRE([AC_CANONICAL_HOST]) acl_libdirstem=lib - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; + acl_libdirstem2= + case "$host_os" in + solaris*) + dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment + dnl . + dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." + dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the + dnl symlink is missing, so we set acl_libdirstem2 too. + AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], + [AC_EGREP_CPP([sixtyfour bits], [ +#ifdef _LP64 +sixtyfour bits +#endif + ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) + ]) + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; esac fi - done - IFS="$acl_save_IFS" - fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" ]) diff -Nru cogl-1.22.0/build/autotools/libtool.m4 cogl-1.22.2/build/autotools/libtool.m4 --- cogl-1.22.0/build/autotools/libtool.m4 2015-09-16 14:00:44.000000000 +0000 +++ cogl-1.22.2/build/autotools/libtool.m4 2016-08-26 17:33:48.000000000 +0000 @@ -1,8 +1,6 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -10,36 +8,30 @@ # modifications, as long as this notice is preserved. m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . ]) -# serial 57 LT_INIT +# serial 58 LT_INIT # LT_PREREQ(VERSION) @@ -67,7 +59,7 @@ # LT_INIT([OPTIONS]) # ------------------ AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl @@ -91,7 +83,7 @@ _LT_SET_OPTIONS([$0], [$1]) # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -111,26 +103,43 @@ dnl AC_DEFUN([AM_PROG_LIBTOOL], []) +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun([_LT_PREPARE_CC_BASENAME], [ +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +])# _LT_PREPARE_CC_BASENAME + + # _LT_CC_BASENAME(CC) # ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +[m4_require([_LT_PREPARE_CC_BASENAME])dnl +AC_REQUIRE([_LT_DECL_SED])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result ]) # _LT_FILEUTILS_DEFAULTS # ---------------------- # It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. m4_defun([_LT_FILEUTILS_DEFAULTS], [: ${CP="cp -f"} : ${MV="mv -f"} @@ -177,15 +186,16 @@ m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl m4_require([_LT_WITH_SYSROOT])dnl +m4_require([_LT_CMD_TRUNCATE])dnl _LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi ]) -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -198,7 +208,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -209,14 +219,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -269,14 +279,14 @@ # _LT_PROG_LTMAIN # --------------- -# Note that this code is called both from `configure', and `config.status' +# Note that this code is called both from 'configure', and 'config.status' # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, +# 'config.status' has no value for ac_aux_dir unless we are using Automake, # so we pass a copy along to make sure it has a sensible value anyway. m4_defun([_LT_PROG_LTMAIN], [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh ])# _LT_PROG_LTMAIN @@ -286,7 +296,7 @@ # So that we can recreate a full libtool script including additional # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' +# in macros and then make a single call at the end using the 'libtool' # label. @@ -421,8 +431,8 @@ # _LT_CONFIG_STATUS_DECLARE([VARNAME]) # ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME +# Quote a variable value, and forward it to 'config.status' so that its +# declaration there will have the same value as in 'configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) @@ -446,7 +456,7 @@ # Output comment and list of tags supported by the script m4_defun([_LT_LIBTOOL_TAGS], [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl +available_tags='_LT_TAGS'dnl ]) @@ -474,7 +484,7 @@ # _LT_LIBTOOL_CONFIG_VARS # ----------------------- # Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' # script. Tagged libtool config variables (even for the LIBTOOL CONFIG # section) are produced by _LT_LIBTOOL_TAG_VARS. m4_defun([_LT_LIBTOOL_CONFIG_VARS], @@ -500,8 +510,8 @@ # Send accumulated output to $CONFIG_STATUS. Thanks to the lists of # variables for single and double quote escaping we saved from calls # to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated +# into 'config.status', and then the shell code to quote escape them in +# for loops in 'config.status'. Finally, any additional code accumulated # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. m4_defun([_LT_CONFIG_COMMANDS], [AC_PROVIDE_IFELSE([LT_OUTPUT], @@ -547,7 +557,7 @@ ]], lt_decl_quote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -560,7 +570,7 @@ ]], lt_decl_dquote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -576,7 +586,7 @@ # Generate a child script FILE with all initialization necessary to # reuse the environment learned by the parent script, and make the # file executable. If COMMENT is supplied, it is inserted after the -# `#!' sequence but before initialization text begins. After this +# '#!' sequence but before initialization text begins. After this # macro, additional text can be appended to FILE to form the body of # the child script. The macro ends with non-zero status if the # file could not be fully written (such as if the disk is full). @@ -598,7 +608,7 @@ _AS_PREPARE exec AS_MESSAGE_FD>&1 _ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl +test 0 = "$lt_write_fail" && chmod +x $1[]dnl m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT @@ -621,7 +631,7 @@ } >&AS_MESSAGE_LOG_FD lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, +'$as_me' creates a local libtool stub from the current configuration, for use in further configure time tests before the real libtool is generated. @@ -643,7 +653,7 @@ This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." -while test $[#] != 0 +while test 0 != $[#] do case $[1] in --version | --v* | -V ) @@ -656,10 +666,10 @@ lt_cl_silent=: ;; -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; esac shift done @@ -685,7 +695,7 @@ # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. lt_cl_success=: -test "$silent" = yes && +test yes = "$silent" && lt_config_lt_args="$lt_config_lt_args --quiet" exec AS_MESSAGE_LOG_FD>/dev/null $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false @@ -705,27 +715,31 @@ _LT_CONFIG_SAVE_COMMANDS([ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. -# + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + _LT_COPYING _LT_LIBTOOL_TAGS +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + # ### BEGIN LIBTOOL CONFIG _LT_LIBTOOL_CONFIG_VARS _LT_LIBTOOL_TAG_VARS @@ -733,13 +747,24 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +_LT_PREPARE_MUNGE_PATH_LIST +_LT_PREPARE_CC_BASENAME + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -756,8 +781,6 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - _LT_PROG_REPLACE_SHELLFNS - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -775,7 +798,6 @@ [m4_if([$1], [], [ PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile'], []) ])dnl /_LT_CONFIG_SAVE_COMMANDS @@ -974,7 +996,7 @@ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -992,7 +1014,7 @@ cat conftest.err >&AS_MESSAGE_LOG_FD # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1010,7 +1032,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], [lt_cv_ld_exported_symbols_list=yes], [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], @@ -1032,7 +1054,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1042,32 +1064,32 @@ ]) case $host_os in rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[[012]][[,.]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -1087,29 +1109,29 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" +[ if test yes != "$lt_cv_apple_cc_single_mod"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1129,7 +1151,7 @@ # Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -if test "${lt_cv_aix_libpath+set}" = set; then +if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], @@ -1147,7 +1169,7 @@ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi],[]) if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib fi ]) aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) @@ -1167,8 +1189,8 @@ # ----------------------- # Find how we can fake an echo command that does not interpret backslash. # In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). +# of the generated configure script that will find a shell with a builtin +# printf (that we can use as an echo command). m4_defun([_LT_PROG_ECHO_BACKSLASH], [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO @@ -1196,10 +1218,10 @@ # Invoke $ECHO with all args, space-separated. func_echo_all () { - $ECHO "$*" + $ECHO "$*" } -case "$ECHO" in +case $ECHO in printf*) AC_MSG_RESULT([printf]) ;; print*) AC_MSG_RESULT([print -r]) ;; *) AC_MSG_RESULT([cat]) ;; @@ -1225,16 +1247,17 @@ AC_DEFUN([_LT_WITH_SYSROOT], [AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], -[ --with-sysroot[=DIR] Search for dependent libraries within DIR - (or the compiler's sysroot if not specified).], +[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], + [Search for dependent libraries within DIR (or the compiler's sysroot + if not specified).])], [], [with_sysroot=no]) dnl lt_sysroot will always be passed unquoted. We quote it here dnl in case the user passed a directory name. lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -1244,14 +1267,14 @@ no|'') ;; #( *) - AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_RESULT([$with_sysroot]) AC_MSG_ERROR([The sysroot must be an absolute path.]) ;; esac AC_MSG_RESULT([${lt_sysroot:-no}]) _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and in which our libraries should be installed.])]) +[dependent libraries, and where our libraries should be installed.])]) # _LT_ENABLE_LOCK # --------------- @@ -1259,31 +1282,33 @@ [AC_ARG_ENABLE([libtool-lock], [AS_HELP_STRING([--disable-libtool-lock], [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -1312,9 +1337,46 @@ rm -rf conftest* ;; +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1324,7 +1386,14 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" @@ -1369,19 +1438,20 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, [AC_LANG_PUSH(C) AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1389,7 +1459,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -1398,7 +1468,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -1414,7 +1484,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock ])# _LT_ENABLE_LOCK @@ -1433,11 +1503,11 @@ [echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -1445,7 +1515,7 @@ ]) ]) -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -1476,7 +1546,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -1512,7 +1582,7 @@ [$2=no m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" + lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -1539,7 +1609,7 @@ $RM conftest* ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$5], , :, [$5]) else m4_if([$6], , :, [$6]) @@ -1561,7 +1631,7 @@ m4_require([_LT_DECL_SED])dnl AC_CACHE_CHECK([$1], [$2], [$2=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $3" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -1580,10 +1650,10 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$4], , :, [$4]) else m4_if([$5], , :, [$5]) @@ -1604,7 +1674,7 @@ AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -1644,7 +1714,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1694,22 +1764,23 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -1725,7 +1796,7 @@ ;; esac ]) -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then AC_MSG_RESULT($lt_cv_sys_max_cmd_len) else AC_MSG_RESULT(none) @@ -1753,7 +1824,7 @@ # ---------------------------------------------------------------- m4_defun([_LT_TRY_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : +if test yes = "$cross_compiling"; then : [$4] else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -1800,9 +1871,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -1828,7 +1899,7 @@ return status; }] _LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null lt_status=$? case x$lt_status in @@ -1849,7 +1920,7 @@ # ------------------ AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then +if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -1859,44 +1930,52 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ]) ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], + [lt_cv_dlopen=shl_load], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], + [lt_cv_dlopen=dlopen], [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld]) ]) ]) ]) @@ -1905,21 +1984,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" AC_CACHE_CHECK([whether a program can dlopen itself], @@ -1929,7 +2008,7 @@ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ]) - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl @@ -1939,9 +2018,9 @@ ]) fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -2033,8 +2112,8 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl _LT_COMPILER_C_O([$1]) -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user AC_MSG_CHECKING([if we can lock with hard links]) hard_links=yes @@ -2044,8 +2123,8 @@ ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) + if test no = "$hard_links"; then + AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) need_locks=warn fi else @@ -2072,8 +2151,8 @@ _LT_DECL([], [objdir], [0], [The name of the directory that contains temporary libtool files])dnl m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) +AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", + [Define to the sub-directory where libtool stores uninstalled libraries.]) ])# _LT_CHECK_OBJDIR @@ -2085,15 +2164,15 @@ _LT_TAGVAR(hardcode_action, $1)= if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && + test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then # Linking always hardcodes the temporary library directory. _LT_TAGVAR(hardcode_action, $1)=relink else @@ -2107,12 +2186,12 @@ fi AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then +if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || + test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -2136,7 +2215,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) @@ -2154,6 +2233,47 @@ ])# _LT_CMD_STRIPLIB +# _LT_PREPARE_MUNGE_PATH_LIST +# --------------------------- +# Make sure func_munge_path_list() is defined correctly. +m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], +[[# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x@S|@2 in + x) + ;; + *:) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" + ;; + x:*) + eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" + ;; + *) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + esac +} +]])# _LT_PREPARE_PATH_LIST + + # _LT_SYS_DYNAMIC_LINKER([TAG]) # ----------------------------- # PORTME Fill in your ld.so characteristics @@ -2164,17 +2284,18 @@ m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -2190,28 +2311,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -2225,7 +2353,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -2234,7 +2362,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -2251,14 +2379,17 @@ # flags to be left without arguments need_version=unknown +AC_ARG_VAR([LT_SYS_LIBRARY_PATH], +[User-defined run-time library search path.]) + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[[4-9]]*) @@ -2266,41 +2397,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[[01]] | aix4.[[01]].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a[(]lib.so.V[)]' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -2310,18 +2491,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -2329,8 +2510,8 @@ bsdi[[45]]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -2342,7 +2523,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -2351,8 +2532,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -2368,17 +2549,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -2387,8 +2568,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -2415,7 +2596,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -2428,8 +2609,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -2442,7 +2623,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -2455,8 +2636,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -2469,8 +2650,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2488,12 +2669,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -2518,26 +2700,15 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -2555,14 +2726,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -2570,8 +2742,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -2580,8 +2752,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -2594,8 +2766,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2606,7 +2778,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -2614,8 +2786,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -2634,8 +2806,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -2644,13 +2816,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2678,11 +2870,15 @@ # Add ABI-specific directories to the system library path. sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2699,12 +2895,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -2714,7 +2910,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -2723,58 +2919,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -2785,8 +2991,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -2796,11 +3002,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -2808,8 +3014,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -2830,24 +3036,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -2865,7 +3071,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -2873,8 +3079,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2883,20 +3089,30 @@ ;; esac AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + _LT_DECL([], [variables_saved_for_relink], [1], [Variables whose values should be saved in libtool wrapper scripts and restored at link time]) @@ -2929,39 +3145,41 @@ [Whether we should hardcode library paths into libraries]) _LT_DECL([], [sys_lib_search_path_spec], [2], [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) +_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], + [Detected run-time system search path for libraries]) +_LT_DECL([], [configure_time_lt_sys_library_path], [2], + [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) ])# _LT_SYS_DYNAMIC_LINKER # _LT_PATH_TOOL_PREFIX(TOOL) # -------------------------- -# find a file program which can recognize shared library +# find a file program that can recognize shared library AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, [case $MAGIC_CMD in [[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR dnl $ac_dummy forces splitting on constant user-supplied paths. dnl POSIX.2 word splitting is done only on the output of word expansions, dnl not every word. This closes a longstanding sh security hole. ac_dummy="m4_if([$2], , $PATH, [$2])" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -f "$ac_dir/$1"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"$1" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -2984,11 +3202,11 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then AC_MSG_RESULT($MAGIC_CMD) else @@ -3006,7 +3224,7 @@ # _LT_PATH_MAGIC # -------------- -# find a file program which can recognize a shared library +# find a file program that can recognize a shared library m4_defun([_LT_PATH_MAGIC], [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then @@ -3033,16 +3251,16 @@ AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], + [test no = "$withval" || with_gnu_ld=yes], [with_gnu_ld=no])dnl ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. AC_MSG_CHECKING([for ld used by $CC]) case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -3056,7 +3274,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -3067,37 +3285,37 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then AC_MSG_CHECKING([for GNU ld]) else AC_MSG_CHECKING([for non-GNU ld]) fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], +[if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi]) +rm -f conftest.i conftest2.i conftest.out]) +])# _LT_PATH_DD + + +# _LT_CMD_TRUNCATE +# ---------------- +# find command to truncate a binary pipe +m4_defun([_LT_CMD_TRUNCATE], +[m4_require([_LT_PATH_DD]) +AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], +[printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) +_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], + [Command to truncate a binary pipe]) +])# _LT_CMD_TRUNCATE + + # _LT_CHECK_MAGIC_METHOD # ---------------------- # how to check for library dependencies @@ -3183,13 +3438,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[[4-9]]*) @@ -3216,8 +3471,7 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -3253,10 +3507,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3295,7 +3545,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -3317,8 +3567,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' @@ -3371,6 +3621,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac ]) @@ -3411,33 +3664,38 @@ AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -3448,21 +3706,21 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -3470,8 +3728,8 @@ esac fi AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -3517,8 +3775,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -3530,7 +3788,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac ]) @@ -3557,13 +3815,28 @@ lt_cv_path_mainfest_tool=yes fi rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ])# _LT_PATH_MANIFEST_TOOL +# _LT_DLL_DEF_P([FILE]) +# --------------------- +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with func_dll_def_p in the libtool script +AC_DEFUN([_LT_DLL_DEF_P], +[dnl + test DEF = "`$SED -n dnl + -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace + -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments + -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl + -e q dnl Only consider the first "real" line + $1`" dnl +])# _LT_DLL_DEF_P + + # LT_LIB_M # -------- # check for math library @@ -3575,11 +3848,11 @@ # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ;; *) - AC_CHECK_LIB(m, cos, LIBM="-lm") + AC_CHECK_LIB(m, cos, LIBM=-lm) ;; esac AC_SUBST([LIBM]) @@ -3598,7 +3871,7 @@ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; @@ -3650,7 +3923,7 @@ symcode='[[ABCDGISTW]]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[[ABCDEGRST]]' fi ;; @@ -3683,14 +3956,44 @@ symcode='[[ABCDGIRSTW]]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3708,21 +4011,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -3762,11 +4068,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT@&t@_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT@&t@_DLSYM_CONST #else @@ -3792,7 +4098,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -3812,9 +4118,9 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -3835,7 +4141,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -3862,12 +4168,16 @@ [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], + [Transform the output of nm into a list of symbols to manually relocate]) _LT_DECL([global_symbol_to_c_name_address], [lt_cv_sys_global_symbol_to_c_name_address], [1], [Transform the output of nm in a C name address pair]) _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], + [The name lister interface]) _LT_DECL([], [nm_file_list_spec], [1], [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3883,17 +4193,18 @@ m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -3904,8 +4215,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -3921,6 +4232,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -3970,7 +4286,7 @@ case $host_os in aix[[4-9]]*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4011,14 +4327,14 @@ case $cc_basename in CC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' fi ;; aCC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -4047,7 +4363,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4055,7 +4371,7 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. + # old Intel C++ for x86_64, which still supported -KPIC. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' @@ -4200,17 +4516,18 @@ fi ], [ - if test "$GCC" = yes; then + if test yes = "$GCC"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -4221,8 +4538,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -4239,6 +4556,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -4309,7 +4631,7 @@ case $host_os in aix*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4317,11 +4639,30 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -4337,7 +4678,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -4346,9 +4687,9 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4373,6 +4714,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -4470,7 +4817,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi @@ -4499,7 +4846,7 @@ fi ]) case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; @@ -4565,17 +4912,21 @@ case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds ;; cygwin* | mingw* | cegcc*) case $cc_basename in @@ -4621,9 +4972,9 @@ # included in the symbol list _LT_TAGVAR(include_expsyms, $1)= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -4639,7 +4990,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -4647,7 +4998,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -4657,7 +5008,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -4679,24 +5030,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -4709,7 +5060,7 @@ case $host_os in aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 @@ -4728,7 +5079,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -4744,7 +5095,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4754,7 +5105,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -4762,61 +5113,89 @@ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -4827,42 +5206,47 @@ lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -4876,8 +5260,8 @@ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -4895,8 +5279,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4908,7 +5292,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -4923,9 +5307,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4942,15 +5326,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; esac - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then runpath_var= _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(export_dynamic_flag_spec, $1)= @@ -4966,7 +5350,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_TAGVAR(hardcode_direct, $1)=unsupported @@ -4974,34 +5358,57 @@ ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -5020,13 +5427,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -5045,61 +5460,80 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -5108,7 +5542,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -5138,16 +5572,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -5156,18 +5591,18 @@ # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -5176,7 +5611,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -5226,33 +5661,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5260,25 +5695,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) m4_if($1, [], [ @@ -5286,14 +5721,14 @@ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) _LT_LINKER_OPTION([if $CC understands -b], _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) ;; esac fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in @@ -5304,7 +5739,7 @@ *) _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -5315,16 +5750,16 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. # This should be the same for all languages, so no per-tag cache variable. AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + [save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" AC_LINK_IFELSE( [AC_LANG_SOURCE( [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], @@ -5337,21 +5772,31 @@ end]])])], [lt_cv_irix_exported_symbol=yes], [lt_cv_irix_exported_symbol=no]) - LDFLAGS="$save_LDFLAGS"]) - if test "$lt_cv_irix_exported_symbol" = yes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + LDFLAGS=$save_LDFLAGS]) + if test yes = "$lt_cv_irix_exported_symbol"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(ld_shlibs, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -5366,7 +5811,7 @@ newsos6) _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; @@ -5374,27 +5819,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' fi else _LT_TAGVAR(ld_shlibs, $1)=no @@ -5405,33 +5842,53 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -5442,24 +5899,24 @@ solaris*) _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -5469,11 +5926,11 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' fi @@ -5483,10 +5940,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -5535,43 +5992,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -5586,17 +6043,17 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' ;; esac fi fi ]) AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld @@ -5613,7 +6070,7 @@ # Assume -lc should be added _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $_LT_TAGVAR(archive_cmds, $1) in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -5693,12 +6150,12 @@ _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary]) _LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the + "absolute", i.e impossible to change by setting $shlibpath_var if the library is relocated]) _LT_TAGDECL([], [hardcode_minus_L], [0], [Set to "yes" if using the -LDIR flag during linking hardcodes DIR @@ -5739,10 +6196,10 @@ # ------------------------ # Ensure that the configuration variables for a C compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_C_CONFIG], [m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" +lt_save_CC=$CC AC_LANG_PUSH(C) # Source file extension for C test sources. @@ -5782,18 +6239,18 @@ LT_SYS_DLOPEN_SELF _LT_CMD_STRIPLIB - # Report which library types will actually be built + # Report what library types will actually be built AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -5801,8 +6258,12 @@ ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -5810,13 +6271,13 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) _LT_CONFIG($1) fi AC_LANG_POP -CC="$lt_save_CC" +CC=$lt_save_CC ])# _LT_LANG_C_CONFIG @@ -5824,14 +6285,14 @@ # -------------------------- # Ensure that the configuration variables for a C++ compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_CXX_CONFIG], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_PATH_MANIFEST_TOOL])dnl -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then +if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then AC_PROG_CXXCPP else _lt_caught_CXX_error=yes @@ -5873,7 +6334,7 @@ # the CXX compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then +if test yes != "$_lt_caught_CXX_error"; then # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" @@ -5915,35 +6376,35 @@ if test -n "$compiler"; then # We don't want -fno-exception when compiling C++ code, so set the # no_builtin_flag separately - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' else _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= fi - if test "$GXX" = yes; then + if test yes = "$GXX"; then # Set up default GNU C++ configuration LT_PATH_LD # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + if test yes = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # If archive_cmds runs LD, not CC, wlarc should be empty # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to # investigate it a little bit more. (MM) - wlarc='${wl}' + wlarc='$wl' # ancient GNU ld didn't support --whole-archive et. al. if eval "`$CC -print-prog-name=ld` --help 2>&1" | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi @@ -5979,18 +6440,30 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in @@ -6000,6 +6473,13 @@ ;; esac done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -6018,13 +6498,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GXX" = yes; then + if test yes = "$GXX"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -6042,64 +6530,84 @@ fi esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # The "-G" linker flag allows undefined symbols. + _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' # Determine the default libpath from the value encoded in an empty # executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -6109,7 +6617,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6137,57 +6645,58 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # g++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6198,6 +6707,34 @@ _LT_DARWIN_LINKER_FEATURES($1) ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + dgux*) case $cc_basename in ec++*) @@ -6232,18 +6769,15 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, # but as the default @@ -6255,7 +6789,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6264,11 +6798,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GXX"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -6278,15 +6812,15 @@ ;; hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in hppa*64*|ia64*) ;; *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; esac fi @@ -6312,13 +6846,13 @@ aCC*) case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -6329,20 +6863,20 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -6357,22 +6891,22 @@ interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -6381,22 +6915,22 @@ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ;; *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -6404,8 +6938,8 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6414,10 +6948,10 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # Archives containing C++ object files must be created using # "CC -Bstatic", where "CC" is the KAI C++ compiler. @@ -6431,59 +6965,59 @@ # earlier do not add the objects themselves. case `$CC -V 2>&1` in *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= case $host_cpu in ia64*) tmp_idyn=' -i_dynamic';; esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' ;; pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' ;; cxx*) # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -6497,18 +7031,18 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) @@ -6516,10 +7050,10 @@ *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # Not sure whether something based on @@ -6577,22 +7111,17 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' fi output_verbose_link_cmd=func_echo_all else @@ -6608,9 +7137,9 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Archives containing C++ object files must be created using @@ -6628,17 +7157,17 @@ cxx*) case $host in osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ;; *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; esac @@ -6653,21 +7182,21 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Commands to make compiler produce verbose output that lists @@ -6713,9 +7242,9 @@ # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -6723,7 +7252,7 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. + # but understands '-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; @@ -6740,30 +7269,30 @@ ;; gcx*) # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; *) # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else - # g++ 2.7 appears to require `-G' NOT `-shared' on this + # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -6771,11 +7300,11 @@ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' ;; esac fi @@ -6784,52 +7313,52 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" + '"$_LT_TAGVAR(old_archive_cmds, $1)" _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" + '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; @@ -6860,10 +7389,10 @@ esac AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$GXX + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -6890,7 +7419,7 @@ lt_cv_path_LD=$lt_save_path_LD lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes +fi # test yes != "$_lt_caught_CXX_error" AC_LANG_POP ])# _LT_LANG_CXX_CONFIG @@ -6912,13 +7441,14 @@ AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) func_stripname_cnf () { - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + case @S|@2 in + .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; + *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; esac } # func_stripname_cnf ])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -7002,13 +7532,13 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + case $prev$p in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. # Remove the space. - if test $p = "-L" || - test $p = "-R"; then + if test x-L = "$p" || + test x-R = "$p"; then prev=$p continue fi @@ -7024,16 +7554,16 @@ case $p in =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in + if test no = "$pre_test_object_deps_done"; then + case $prev in -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p" fi ;; # The "-l" case would never come before the object being @@ -7041,9 +7571,9 @@ esac else if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" + _LT_TAGVAR(postdeps, $1)=$prev$p else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" fi fi prev= @@ -7058,15 +7588,15 @@ continue fi - if test "$pre_test_object_deps_done" = no; then + if test no = "$pre_test_object_deps_done"; then if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" + _LT_TAGVAR(predep_objects, $1)=$p else _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" fi else if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" + _LT_TAGVAR(postdep_objects, $1)=$p else _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" fi @@ -7097,51 +7627,6 @@ _LT_TAGVAR(postdep_objects,$1)= _LT_TAGVAR(postdeps,$1)= ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; esac ]) @@ -7150,7 +7635,7 @@ esac _LT_TAGVAR(compiler_lib_search_dirs, $1)= if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'` fi _LT_TAGDECL([], [compiler_lib_search_dirs], [1], [The directories searched by this compiler when creating a shared library]) @@ -7170,10 +7655,10 @@ # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_F77_CONFIG], [AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then +if test -z "$F77" || test no = "$F77"; then _lt_disable_F77=yes fi @@ -7210,7 +7695,7 @@ # the F77 compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then +if test yes != "$_lt_disable_F77"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7232,7 +7717,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} @@ -7246,21 +7731,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7268,11 +7757,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$G77 + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7289,9 +7778,9 @@ fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_F77" AC_LANG_POP ])# _LT_LANG_F77_CONFIG @@ -7301,11 +7790,11 @@ # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_FC_CONFIG], [AC_LANG_PUSH(Fortran) -if test -z "$FC" || test "X$FC" = "Xno"; then +if test -z "$FC" || test no = "$FC"; then _lt_disable_FC=yes fi @@ -7342,7 +7831,7 @@ # the FC compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then +if test yes != "$_lt_disable_FC"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7364,7 +7853,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} @@ -7380,21 +7869,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7402,11 +7895,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7426,7 +7919,7 @@ GCC=$lt_save_GCC CC=$lt_save_CC CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes +fi # test yes != "$_lt_disable_FC" AC_LANG_POP ])# _LT_LANG_FC_CONFIG @@ -7436,7 +7929,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Java Compiler compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GCJ_CONFIG], [AC_REQUIRE([LT_PROG_GCJ])dnl AC_LANG_SAVE @@ -7470,7 +7963,7 @@ CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. @@ -7507,7 +8000,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Go compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GO_CONFIG], [AC_REQUIRE([LT_PROG_GO])dnl AC_LANG_SAVE @@ -7541,7 +8034,7 @@ CFLAGS=$GOFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # Go did not exist at the time GCC didn't implicitly link libc in. @@ -7578,7 +8071,7 @@ # ------------------------- # Ensure that the configuration variables for the Windows resource compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_RC_CONFIG], [AC_REQUIRE([LT_PROG_RC])dnl AC_LANG_SAVE @@ -7594,7 +8087,7 @@ lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" +lt_simple_link_test_code=$lt_simple_compile_test_code # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_TAG_COMPILER @@ -7604,7 +8097,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC="$CC" +lt_save_CC=$CC lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= @@ -7633,7 +8126,7 @@ [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" AC_SUBST(GCJFLAGS)])])[]dnl ]) @@ -7744,7 +8237,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue + test ! -f "$lt_ac_sed" && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -7761,9 +8254,9 @@ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break cmp -s conftest.out conftest.nl || break # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break + test 10 -lt "$lt_ac_count" && break lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then + if test "$lt_ac_count" -gt "$lt_ac_max"; then lt_ac_max=$lt_ac_count lt_cv_path_SED=$lt_ac_sed fi @@ -7787,27 +8280,7 @@ # Find out whether the shell is Bourne or XSI compatible, # or has some other useful features. m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else lt_unset=false @@ -7831,102 +8304,9 @@ ])# _LT_CHECK_SHELL_FEATURES -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -# ------------------------------------------------------ -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -m4_defun([_LT_PROG_FUNCTION_REPLACE], -[dnl { -sed -e '/^$1 ()$/,/^} # $1 /c\ -$1 ()\ -{\ -m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: -]) - - -# _LT_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. -m4_defun([_LT_PROG_REPLACE_SHELLFNS], -[if test x"$xsi_shell" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) - - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi - -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - - _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl - func_quote_for_eval "${2}" -dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ - eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) - # _LT_PATH_CONVERSION_FUNCTIONS # ----------------------------- -# Determine which file name conversion functions should be used by +# Determine what file name conversion functions should be used by # func_to_host_file (and, implicitly, by func_to_host_path). These are needed # for certain cross-compile configurations and native mingw. m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], diff -Nru cogl-1.22.0/build/autotools/lt~obsolete.m4 cogl-1.22.2/build/autotools/lt~obsolete.m4 --- cogl-1.22.0/build/autotools/lt~obsolete.m4 2015-09-16 14:00:44.000000000 +0000 +++ cogl-1.22.2/build/autotools/lt~obsolete.m4 2016-08-26 17:33:48.000000000 +0000 @@ -1,6 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives @@ -11,7 +12,7 @@ # These exist entirely to fool aclocal when bootstrapping libtool. # -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), # which have later been changed to m4_define as they aren't part of the # exported API, or moved to Autoconf or Automake where they belong. # @@ -25,7 +26,7 @@ # included after everything else. This provides aclocal with the # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything # because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. # # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. # Yes, that means every name once taken will need to remain here until diff -Nru cogl-1.22.0/build/autotools/ltoptions.m4 cogl-1.22.2/build/autotools/ltoptions.m4 --- cogl-1.22.0/build/autotools/ltoptions.m4 2015-09-16 14:00:44.000000000 +0000 +++ cogl-1.22.2/build/autotools/ltoptions.m4 2016-08-26 17:33:48.000000000 +0000 @@ -1,14 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 7 ltoptions.m4 +# serial 8 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -29,7 +29,7 @@ [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl + [m4_warning([Unknown $1 option '$2'])])[]dnl ]) @@ -75,13 +75,15 @@ dnl dnl If no reference was made to various pairs of opposing options, then dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared dnl archives by default: _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) + [_LT_ENABLE_FAST_INSTALL]) + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], + [_LT_WITH_AIX_SONAME([aix])]) ]) ])# _LT_SET_OPTIONS @@ -112,7 +114,7 @@ [_LT_SET_OPTION([LT_INIT], [dlopen]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) +put the 'dlopen' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -148,7 +150,7 @@ _LT_SET_OPTION([LT_INIT], [win32-dll]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) +put the 'win32-dll' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -157,9 +159,9 @@ # _LT_ENABLE_SHARED([DEFAULT]) # ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-shared flag, and supports the 'shared' and +# 'disable-shared' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_SHARED], [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([shared], @@ -172,14 +174,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) @@ -211,9 +213,9 @@ # _LT_ENABLE_STATIC([DEFAULT]) # ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-static flag, and support the 'static' and +# 'disable-static' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_STATIC], [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([static], @@ -226,14 +228,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_static=]_LT_ENABLE_STATIC_DEFAULT) @@ -265,9 +267,9 @@ # _LT_ENABLE_FAST_INSTALL([DEFAULT]) # ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-fast-install flag, and support the 'fast-install' +# and 'disable-fast-install' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_FAST_INSTALL], [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([fast-install], @@ -280,14 +282,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) @@ -304,14 +306,14 @@ [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) +the 'fast-install' option into LT_INIT's first parameter.]) ]) AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) +the 'disable-fast-install' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -319,11 +321,64 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) +# _LT_WITH_AIX_SONAME([DEFAULT]) +# ---------------------------------- +# implement the --with-aix-soname flag, and support the `aix-soname=aix' +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. +m4_define([_LT_WITH_AIX_SONAME], +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl +shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) + AC_ARG_WITH([aix-soname], + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], + [case $withval in + aix|svr4|both) + ;; + *) + AC_MSG_ERROR([Unknown argument to --with-aix-soname]) + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname], + [AC_CACHE_VAL([lt_cv_with_aix_soname], + [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) + with_aix_soname=$lt_cv_with_aix_soname]) + AC_MSG_RESULT([$with_aix_soname]) + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + +_LT_DECL([], [shared_archive_member_spec], [0], + [Shared archive member basename, for filename based shared library versioning on AIX])dnl +])# _LT_WITH_AIX_SONAME + +LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) + + # _LT_WITH_PIC([MODE]) # -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' # LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], @@ -334,19 +389,17 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + [pic_mode=m4_default([$1], [default])]) _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl ])# _LT_WITH_PIC @@ -359,7 +412,7 @@ [_LT_SET_OPTION([LT_INIT], [pic-only]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) +put the 'pic-only' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: diff -Nru cogl-1.22.0/build/autotools/ltsugar.m4 cogl-1.22.2/build/autotools/ltsugar.m4 --- cogl-1.22.0/build/autotools/ltsugar.m4 2015-09-16 14:00:44.000000000 +0000 +++ cogl-1.22.2/build/autotools/ltsugar.m4 2016-08-26 17:33:48.000000000 +0000 @@ -1,6 +1,7 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -33,7 +34,7 @@ # ------------ # Manipulate m4 lists. # These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. +# Autoconf-2.59, which quotes differently. m4_define([lt_car], [[$1]]) m4_define([lt_cdr], [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], @@ -44,7 +45,7 @@ # lt_append(MACRO-NAME, STRING, [SEPARATOR]) # ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. # Note that neither SEPARATOR nor STRING are expanded; they are appended # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). # No SEPARATOR is output if MACRO-NAME was previously undefined (different diff -Nru cogl-1.22.0/build/autotools/ltversion.m4 cogl-1.22.2/build/autotools/ltversion.m4 --- cogl-1.22.0/build/autotools/ltversion.m4 2015-09-16 14:00:44.000000000 +0000 +++ cogl-1.22.2/build/autotools/ltversion.m4 2016-08-26 17:33:48.000000000 +0000 @@ -1,6 +1,6 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3337 ltversion.m4 +# serial 4179 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' +[macro_version='2.4.6' +macro_revision='2.4.6' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru cogl-1.22.0/build/autotools/nls.m4 cogl-1.22.2/build/autotools/nls.m4 --- cogl-1.22.0/build/autotools/nls.m4 2015-09-16 14:00:37.000000000 +0000 +++ cogl-1.22.2/build/autotools/nls.m4 2016-08-26 17:33:37.000000000 +0000 @@ -1,5 +1,6 @@ -# nls.m4 serial 3 (gettext-0.15) -dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, +dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,15 +18,15 @@ dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS - AC_ARG_ENABLE(nls, + AC_ARG_ENABLE([nls], [ --disable-nls do not use Native Language Support], USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) ]) diff -Nru cogl-1.22.0/build/autotools/po.m4 cogl-1.22.2/build/autotools/po.m4 --- cogl-1.22.0/build/autotools/po.m4 2015-09-16 14:00:37.000000000 +0000 +++ cogl-1.22.2/build/autotools/po.m4 2016-08-26 17:33:37.000000000 +0000 @@ -1,5 +1,5 @@ -# po.m4 serial 15 (gettext-0.17) -dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. +# po.m4 serial 22 (gettext-0.19) +dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,19 +17,20 @@ dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.60]) dnl Checks for all prerequisites of the po subdirectory. AC_DEFUN([AM_PO_SUBDIRS], [ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake + AC_REQUIRE([AC_PROG_MKDIR_P])dnl + AC_REQUIRE([AC_PROG_SED])dnl AC_REQUIRE([AM_NLS])dnl dnl Release version of the gettext macros. This is used to ensure that dnl the gettext macros and po/Makefile.in.in are in sync. - AC_SUBST([GETTEXT_MACRO_VERSION], [0.17]) + AC_SUBST([GETTEXT_MACRO_VERSION], [0.19]) dnl Perform the following tests also if --disable-nls has been given, dnl because they are needed for "make dist" to work. @@ -41,7 +42,7 @@ [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], :) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT]) dnl Test whether it is GNU msgfmt >= 0.15. changequote(,)dnl @@ -102,7 +103,7 @@ case "$ac_file" in */Makefile.in) # Adjust a relative srcdir. ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` # In autoconf-2.13 it is called $ac_given_srcdir. # In autoconf-2.50 it is called $srcdir. @@ -118,7 +119,8 @@ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then rm -f "$ac_dir/POTFILES" test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + gt_tab=`printf '\t'` + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" POMAKEFILEDEPS="POTFILES.in" # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend # on $ac_dir but don't depend on user-specified configuration @@ -129,12 +131,12 @@ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" else # The set of available languages was given in configure.in. - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi # Compute POFILES @@ -226,7 +228,7 @@ changequote(,)dnl # Adjust a relative srcdir. ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` # In autoconf-2.13 it is called $ac_given_srcdir. # In autoconf-2.50 it is called $srcdir. @@ -254,6 +256,7 @@ fi # A sed script that extracts the value of VARIABLE from a Makefile. + tab=`printf '\t'` sed_x_variable=' # Test if the hold space is empty. x @@ -261,9 +264,9 @@ x ta # Yes it was empty. Look if we have the expected variable definition. -/^[ ]*VARIABLE[ ]*=/{ +/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{ # Seen the first line of the variable definition. - s/^[ ]*VARIABLE[ ]*=// + s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=// ba } bd @@ -315,7 +318,7 @@ sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'` ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` fi - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' # Compute POFILES # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) @@ -405,14 +408,15 @@ fi sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp" + tab=`printf '\t'` if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then # Add dependencies that cannot be formulated as a simple suffix rule. for lang in $ALL_LINGUAS; do frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` cat >> "$ac_file.tmp" <> "$ac_file.tmp" <, 1996. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) # Search path for a program which passes the given test. @@ -27,15 +27,14 @@ # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi # Find out how to test for executable files. Don't use a zero-byte file, @@ -55,7 +54,7 @@ # Extract the first word of "$2", so it can be a program name with args. set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, +AC_CACHE_VAL([ac_cv_path_$1], [case "[$]$1" in [[\\/]]* | ?:[[\\/]]*) ac_cv_path_$1="[$]$1" # Let the user override the test with a path. @@ -84,9 +83,9 @@ esac])dnl $1="$ac_cv_path_$1" if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) + AC_MSG_RESULT([$][$1]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi -AC_SUBST($1)dnl +AC_SUBST([$1])dnl ]) diff -Nru cogl-1.22.0/build/config.rpath cogl-1.22.2/build/config.rpath --- cogl-1.22.0/build/config.rpath 2015-09-16 14:00:36.000000000 +0000 +++ cogl-1.22.2/build/config.rpath 2016-08-26 17:33:37.000000000 +0000 @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2007 Free Software Foundation, Inc. +# Copyright 1996-2014 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit , 1996 # @@ -25,7 +25,7 @@ # known workaround is to choose shorter directory names for the build # directory and/or the installation directory. -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a shrext=.so @@ -47,7 +47,7 @@ done cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` -# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. +# Code taken from libtool.m4's _LT_COMPILER_PIC. wl= if test "$GCC" = yes; then @@ -57,14 +57,7 @@ aix*) wl='-Wl,' ;; - darwin*) - case $cc_basename in - xlc*) - wl='-Wl,' - ;; - esac - ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) ;; hpux9* | hpux10* | hpux11*) wl='-Wl,' @@ -72,24 +65,37 @@ irix5* | irix6* | nonstopux*) wl='-Wl,' ;; - newsos6) - ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in - icc* | ecc*) + ecc*) wl='-Wl,' ;; - pgcc | pgf77 | pgf90) + icc* | ifort*) + wl='-Wl,' + ;; + lf95*) + wl='-Wl,' + ;; + nagfor*) + wl='-Wl,-Wl,,' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) wl='-Wl,' ;; ccc*) wl='-Wl,' ;; + xl* | bgxl* | bgf* | mpixl*) + wl='-Wl,' + ;; como) wl='-lopt=' ;; *) case `$CC -V 2>&1 | sed 5q` in + *Sun\ F* | *Sun*Fortran*) + wl= + ;; *Sun\ C*) wl='-Wl,' ;; @@ -97,13 +103,24 @@ ;; esac ;; + newsos6) + ;; + *nto* | *qnx*) + ;; osf3* | osf4* | osf5*) wl='-Wl,' ;; rdos*) ;; solaris*) - wl='-Wl,' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + wl='-Qoption ld ' + ;; + *) + wl='-Wl,' + ;; + esac ;; sunos4*) wl='-Qoption ld ' @@ -124,7 +141,7 @@ esac fi -# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. +# Code taken from libtool.m4's _LT_LINKER_SHLIBS. hardcode_libdir_flag_spec= hardcode_libdir_separator= @@ -132,7 +149,7 @@ hardcode_minus_L=no case "$host_os" in - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -158,22 +175,21 @@ # option of GNU ld is called -rpath, not --rpath. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' case "$host_os" in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs=no fi ;; amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we cannot use - # them. - ld_shlibs=no + case "$host_cpu" in + powerpc) + ;; + m68k) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; beos*) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then @@ -182,7 +198,7 @@ ld_shlibs=no fi ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' @@ -192,11 +208,13 @@ ld_shlibs=no fi ;; + haiku*) + ;; interix[3-9]*) hardcode_direct=no hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; - gnu* | linux* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : else @@ -254,7 +272,7 @@ hardcode_direct=unsupported fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -264,7 +282,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -319,14 +337,18 @@ fi ;; amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # see comment about different semantics on the GNU ld section - ld_shlibs=no + case "$host_cpu" in + powerpc) + ;; + m68k) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; bsdi[45]*) ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is @@ -336,24 +358,15 @@ ;; darwin* | rhapsody*) hardcode_direct=no - if test "$GCC" = yes ; then + if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then : else - case $cc_basename in - xlc*) - ;; - *) - ld_shlibs=no - ;; - esac + ld_shlibs=no fi ;; dgux*) hardcode_libdir_flag_spec='-L$libdir' ;; - freebsd1*) - ld_shlibs=no - ;; freebsd2.2*) hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -414,6 +427,8 @@ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: ;; + *nto* | *qnx*) + ;; openbsd*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes @@ -494,7 +509,7 @@ fi # Check dynamic linker characteristics -# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. +# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER. # Unlike libtool.m4, here we don't care about _all_ names of the library, but # only about the one the linker finds when passed -lNAME. This is the last # element of library_names_spec in libtool.m4, or possibly two of them if the @@ -505,11 +520,16 @@ aix3*) library_names_spec='$libname.a' ;; - aix4* | aix5*) + aix[4-9]*) library_names_spec='$libname$shrext' ;; amigaos*) - library_names_spec='$libname.a' + case "$host_cpu" in + powerpc*) + library_names_spec='$libname$shrext' ;; + m68k) + library_names_spec='$libname.a' ;; + esac ;; beos*) library_names_spec='$libname$shrext' @@ -517,7 +537,7 @@ bsdi[45]*) library_names_spec='$libname$shrext' ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; @@ -528,8 +548,6 @@ dgux*) library_names_spec='$libname$shrext' ;; - freebsd1*) - ;; freebsd* | dragonfly*) case "$host_os" in freebsd[123]*) @@ -541,6 +559,9 @@ gnu*) library_names_spec='$libname$shrext' ;; + haiku*) + library_names_spec='$libname$shrext' + ;; hpux9* | hpux10* | hpux11*) case $host_cpu in ia64*) @@ -576,7 +597,7 @@ ;; linux*oldld* | linux*aout* | linux*coff*) ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) library_names_spec='$libname$shrext' ;; knetbsd*-gnu) @@ -588,7 +609,7 @@ newsos6) library_names_spec='$libname$shrext' ;; - nto-qnx*) + *nto* | *qnx*) library_names_spec='$libname$shrext' ;; openbsd*) @@ -619,6 +640,9 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) library_names_spec='$libname$shrext' ;; + tpf*) + library_names_spec='$libname$shrext' + ;; uts4*) library_names_spec='$libname$shrext' ;; diff -Nru cogl-1.22.0/build/ltmain.sh cogl-1.22.2/build/ltmain.sh --- cogl-1.22.0/build/ltmain.sh 2015-09-16 14:00:44.000000000 +0000 +++ cogl-1.22.2/build/ltmain.sh 2016-08-26 17:33:47.000000000 +0000 @@ -1,9 +1,12 @@ +#! /bin/sh +## DO NOT EDIT - This file generated from ./build-aux/ltmain.in +## by inline-source v2014-01-03.01 -# libtool (GNU libtool) 2.4.2 +# libtool (GNU libtool) 2.4.6 +# Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -23,881 +26,2112 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.2 -TIMESTAMP="" -package_revision=1.3337 +VERSION=2.4.6 +package_revision=2.4.6 -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + +## ------ ## +## Usage. ## +## ------ ## + +# Run './libtool --help' for help with using this script from the +# command line. + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# After configure completes, it has a better idea of some of the +# shell tools we need than the defaults used by the functions shared +# with bootstrap, so set those here where they can still be over- +# ridden by the user, but otherwise take precedence. + +: ${AUTOCONF="autoconf"} +: ${AUTOMAKE="automake"} + + +## -------------------------- ## +## Source external libraries. ## +## -------------------------- ## + +# Much of our low-level functionality needs to be sourced from external +# libraries, which are installed to $pkgauxdir. + +# Set a version string for this script. +scriptversion=2015-01-20.17; # UTC + +# General shell script boiler plate, and helper functions. +# Written by Gary V. Vaughan, 2004 + +# Copyright (C) 2004-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# As a special exception to the GNU General Public License, if you distribute +# this file as part of a program or library that is built using GNU Libtool, +# you may include this file under the same distribution terms that you use +# for the rest of that program. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# Evaluate this file near the top of your script to gain access to +# the functions and variables defined here: +# +# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh +# +# If you need to override any of the default environment variable +# settings, do that before evaluating this file. + + +## -------------------- ## +## Shell normalisation. ## +## -------------------- ## + +# Some shells need a little help to be as Bourne compatible as possible. +# Before doing anything else, make sure all that help has been provided! + +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +# NLS nuisances: We save the old values in case they are required later. +_G_user_locale= +_G_safe_locale= +for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + eval "if test set = \"\${$_G_var+set}\"; then + save_$_G_var=\$$_G_var + $_G_var=C + export $_G_var + _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\" + _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL -$lt_unset CDPATH +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Make sure IFS has a sensible default +sp=' ' +nl=' +' +IFS="$sp $nl" +# There are apparently some retarded systems that use ';' as a PATH separator! +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" +## ------------------------- ## +## Locate command utilities. ## +## ------------------------- ## + + +# func_executable_p FILE +# ---------------------- +# Check that FILE is an executable regular file. +func_executable_p () +{ + test -f "$1" && test -x "$1" +} + + +# func_path_progs PROGS_LIST CHECK_FUNC [PATH] +# -------------------------------------------- +# Search for either a program that responds to --version with output +# containing "GNU", or else returned by CHECK_FUNC otherwise, by +# trying all the directories in PATH with each of the elements of +# PROGS_LIST. +# +# CHECK_FUNC should accept the path to a candidate program, and +# set $func_check_prog_result if it truncates its output less than +# $_G_path_prog_max characters. +func_path_progs () +{ + _G_progs_list=$1 + _G_check_func=$2 + _G_PATH=${3-"$PATH"} + + _G_path_prog_max=0 + _G_path_prog_found=false + _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:} + for _G_dir in $_G_PATH; do + IFS=$_G_save_IFS + test -z "$_G_dir" && _G_dir=. + for _G_prog_name in $_G_progs_list; do + for _exeext in '' .EXE; do + _G_path_prog=$_G_dir/$_G_prog_name$_exeext + func_executable_p "$_G_path_prog" || continue + case `"$_G_path_prog" --version 2>&1` in + *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;; + *) $_G_check_func $_G_path_prog + func_path_progs_result=$func_check_prog_result + ;; + esac + $_G_path_prog_found && break 3 + done + done + done + IFS=$_G_save_IFS + test -z "$func_path_progs_result" && { + echo "no acceptable sed could be found in \$PATH" >&2 + exit 1 + } +} + + +# We want to be able to use the functions in this file before configure +# has figured out where the best binaries are kept, which means we have +# to search for them ourselves - except when the results are already set +# where we skip the searches. + +# Unless the user overrides by setting SED, search the path for either GNU +# sed, or the sed that truncates its output the least. +test -z "$SED" && { + _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for _G_i in 1 2 3 4 5 6 7; do + _G_sed_script=$_G_sed_script$nl$_G_sed_script + done + echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed + _G_sed_script= + + func_check_prog_sed () + { + _G_path_prog=$1 + + _G_count=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo '' >> conftest.nl + "$_G_path_prog" -f conftest.sed conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + rm -f conftest.sed + SED=$func_path_progs_result +} + + +# Unless the user overrides by setting GREP, search the path for either GNU +# grep, or the grep that truncates its output the least. +test -z "$GREP" && { + func_check_prog_grep () + { + _G_path_prog=$1 + + _G_count=0 + _G_path_prog_max=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo 'GREP' >> conftest.nl + "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + GREP=$func_path_progs_result +} + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# All uppercase variable names are used for environment variables. These +# variables can be overridden by the user before calling a script that +# uses them if a suitable command of that name is not already available +# in the command search PATH. : ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${ECHO="printf %s\n"} +: ${EGREP="$GREP -E"} +: ${FGREP="$GREP -F"} +: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" -dirname="s,/[^/]*$,," -basename="s,^.*/,," -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation +## -------------------- ## +## Useful sed snippets. ## +## -------------------- ## +sed_dirname='s|/[^/]*$||' +sed_basename='s|^.*/||' -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s|\([`"$\\]\)|\\\1|g' +# Same as above, but do not quote variable references. +sed_double_quote_subst='s/\(["`\\]\)/\\\1/g' -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g' +# Sed substitution that converts a w32 file name or path +# that contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation +# Re-'\' parameter expansions in output of sed_double_quote_subst that +# were '\'-ed in input to the same. If an odd number of '\' preceded a +# '$' in input to sed_double_quote_subst, that '$' was protected from +# expansion. Since each input '\' is now two '\'s, look for any number +# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'. +_G_bs='\\' +_G_bs2='\\\\' +_G_bs4='\\\\\\\\' +_G_dollar='\$' +sed_double_backslash="\ + s/$_G_bs4/&\\ +/g + s/^$_G_bs2$_G_dollar/$_G_bs&/ + s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g + s/\n//g" -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' +## ----------------- ## +## Global variables. ## +## ----------------- ## + +# Except for the global variables explicitly listed below, the following +# functions in the '^func_' namespace, and the '^require_' namespace +# variables initialised in the 'Resource management' section, sourcing +# this file will not pollute your global namespace with anything +# else. There's no portable way to scope variables in Bourne shell +# though, so actually running these functions will sometimes place +# results into a variable named after the function, and often use +# temporary variables in the '^_G_' namespace. If you are careful to +# avoid using those namespaces casually in your sourcing script, things +# should continue to work as you expect. And, of course, you can freely +# overwrite any of the functions or variables defined here before +# calling anything to customize them. -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -} +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done +# Allow overriding, eg assuming that you follow the convention of +# putting '$debug_cmd' at the start of all your functions, you can get +# bash to show function call trace with: +# +# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +debug_cmd=${debug_cmd-":"} +exit_cmd=: - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi +# By convention, finish your script with: +# +# exit $exit_status +# +# so that you can set exit_status to non-zero if you want to indicate +# something went wrong during execution without actually bailing out at +# the point of failure. +exit_status=$EXIT_SUCCESS - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath=$0 -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result +# The name of this program. +progname=`$ECHO "$progpath" |$SED "$sed_basename"` -# Make sure we have an absolute path for reexecution: +# Make sure we have an absolute progpath for reexecution: case $progpath in [\\/]*|[A-Za-z]:\\*) ;; *[\\/]*) - progdir=$func_dirname_result + progdir=`$ECHO "$progpath" |$SED "$sed_dirname"` progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; *) - save_IFS="$IFS" + _G_IFS=$IFS IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do - IFS="$save_IFS" + IFS=$_G_IFS test -x "$progdir/$progname" && break done - IFS="$save_IFS" + IFS=$_G_IFS test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' -sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - -# Re-`\' parameter expansions in output of double_quote_subst that were -# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -# in input to double_quote_subst, that '$' was protected from expansion. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" +## ----------------- ## +## Standard options. ## +## ----------------- ## + +# The following options affect the operation of the functions defined +# below, and should be set appropriately depending on run-time para- +# meters passed on the command line. -# Standard options: opt_dry_run=false -opt_help=false opt_quiet=false opt_verbose=false -opt_warning=: - -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -} -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} +# Categories 'all' and 'none' are always available. Append any others +# you will pass as the first argument to func_warning from your own +# code. +warning_categories= + +# By default, display warnings according to 'opt_warning_types'. Set +# 'warning_func' to ':' to elide all warnings, or func_fatal_error to +# treat the next displayed warning as a fatal error. +warning_func=func_warn_and_continue + +# Set to 'all' to display all warnings, 'none' to suppress all +# warnings, or a space delimited list of some subset of +# 'warning_categories' to display only the listed warnings. +opt_warning_types=all + + +## -------------------- ## +## Resource management. ## +## -------------------- ## + +# This section contains definitions for functions that each ensure a +# particular resource (a file, or a non-empty configuration variable for +# example) is available, and if appropriate to extract default values +# from pertinent package files. Call them using their associated +# 'require_*' variable to ensure that they are executed, at most, once. +# +# It's entirely deliberate that calling these functions can set +# variables that don't obey the namespace limitations obeyed by the rest +# of this file, in order that that they be as useful as possible to +# callers. + + +# require_term_colors +# ------------------- +# Allow display of bold text on terminals that support it. +require_term_colors=func_require_term_colors +func_require_term_colors () +{ + $debug_cmd + + test -t 1 && { + # COLORTERM and USE_ANSI_COLORS environment variables take + # precedence, because most terminfo databases neglect to describe + # whether color sequences are supported. + test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"} + + if test 1 = "$USE_ANSI_COLORS"; then + # Standard ANSI escape sequences + tc_reset='' + tc_bold=''; tc_standout='' + tc_red=''; tc_green='' + tc_blue=''; tc_cyan='' + else + # Otherwise trust the terminfo database after all. + test -n "`tput sgr0 2>/dev/null`" && { + tc_reset=`tput sgr0` + test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold` + tc_standout=$tc_bold + test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso` + test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1` + test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2` + test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` + test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` + } + fi + } - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : + require_term_colors=: } -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} -# func_error arg... -# Echo program name prefixed message to standard error. -func_error () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -} +## ----------------- ## +## Function library. ## +## ----------------- ## -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 +# This section contains a variety of useful functions to call in your +# scripts. Take note of the portable wrappers for features provided by +# some modern shells, which will fall back to slower equivalents on +# less featureful shells. - # bash bug again: - : -} -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () -{ - func_error ${1+"$@"} - exit $EXIT_FAILURE -} +# func_append VAR VALUE +# --------------------- +# Append VALUE onto the existing contents of VAR. -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" -} -help="Try \`$progname --help' for more information." ## default + # We should try to minimise forks, especially on Windows where they are + # unreasonably slow, so skip the feature probes when bash or zsh are + # being used: + if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then + : ${_G_HAVE_ARITH_OP="yes"} + : ${_G_HAVE_XSI_OPS="yes"} + # The += operator was introduced in bash 3.1 + case $BASH_VERSION in + [12].* | 3.0 | 3.0*) ;; + *) + : ${_G_HAVE_PLUSEQ_OP="yes"} + ;; + esac + fi + # _G_HAVE_PLUSEQ_OP + # Can be empty, in which case the shell is probed, "yes" if += is + # useable or anything else if it does not work. + test -z "$_G_HAVE_PLUSEQ_OP" \ + && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ + && _G_HAVE_PLUSEQ_OP=yes + +if test yes = "$_G_HAVE_PLUSEQ_OP" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_append () + { + $debug_cmd + + eval "$1+=\$2" + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_append () + { + $debug_cmd + + eval "$1=\$$1\$2" + } +fi + + +# func_append_quoted VAR VALUE +# ---------------------------- +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +if test yes = "$_G_HAVE_PLUSEQ_OP"; then + eval 'func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1+=\\ \$func_quote_for_eval_result" + }' +else + func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1=\$$1\\ \$func_quote_for_eval_result" + } +fi + + +# func_append_uniq VAR VALUE +# -------------------------- +# Append unique VALUE onto the existing contents of VAR, assuming +# entries are delimited by the first character of VALUE. For example: +# +# func_append_uniq options " --another-option option-argument" +# +# will only append to $options if " --another-option option-argument " +# is not already present somewhere in $options already (note spaces at +# each end implied by leading space in second argument). +func_append_uniq () +{ + $debug_cmd + + eval _G_current_value='`$ECHO $'$1'`' + _G_delim=`expr "$2" : '\(.\)'` + + case $_G_delim$_G_current_value$_G_delim in + *"$2$_G_delim"*) ;; + *) func_append "$@" ;; + esac +} + + +# func_arith TERM... +# ------------------ +# Set func_arith_result to the result of evaluating TERMs. + test -z "$_G_HAVE_ARITH_OP" \ + && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \ + && _G_HAVE_ARITH_OP=yes + +if test yes = "$_G_HAVE_ARITH_OP"; then + eval 'func_arith () + { + $debug_cmd + + func_arith_result=$(( $* )) + }' +else + func_arith () + { + $debug_cmd + + func_arith_result=`expr "$@"` + } +fi + + +# func_basename FILE +# ------------------ +# Set func_basename_result to FILE with everything up to and including +# the last / stripped. +if test yes = "$_G_HAVE_XSI_OPS"; then + # If this shell supports suffix pattern removal, then use it to avoid + # forking. Hide the definitions single quotes in case the shell chokes + # on unsupported syntax... + _b='func_basename_result=${1##*/}' + _d='case $1 in + */*) func_dirname_result=${1%/*}$2 ;; + * ) func_dirname_result=$3 ;; + esac' + +else + # ...otherwise fall back to using sed. + _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`' + _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"` + if test "X$func_dirname_result" = "X$1"; then + func_dirname_result=$3 + else + func_append func_dirname_result "$2" + fi' +fi + +eval 'func_basename () +{ + $debug_cmd + + '"$_b"' +}' + + +# func_dirname FILE APPEND NONDIR_REPLACEMENT +# ------------------------------------------- +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +eval 'func_dirname () +{ + $debug_cmd -# func_grep expression filename + '"$_d"' +}' + + +# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT +# -------------------------------------------------------- +# Perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# For efficiency, we do not delegate to the functions above but instead +# duplicate the functionality here. +eval 'func_dirname_and_basename () +{ + $debug_cmd + + '"$_b"' + '"$_d"' +}' + + +# func_echo ARG... +# ---------------- +# Echo program name prefixed message. +func_echo () +{ + $debug_cmd + + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname: $_G_line" + done + IFS=$func_echo_IFS +} + + +# func_echo_all ARG... +# -------------------- +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + + +# func_echo_infix_1 INFIX ARG... +# ------------------------------ +# Echo program name, followed by INFIX on the first line, with any +# additional lines not showing INFIX. +func_echo_infix_1 () +{ + $debug_cmd + + $require_term_colors + + _G_infix=$1; shift + _G_indent=$_G_infix + _G_prefix="$progname: $_G_infix: " + _G_message=$* + + # Strip color escape sequences before counting printable length + for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan" + do + test -n "$_G_tc" && { + _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"` + _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"` + } + done + _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes + + func_echo_infix_1_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_infix_1_IFS + $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2 + _G_prefix=$_G_indent + done + IFS=$func_echo_infix_1_IFS +} + + +# func_error ARG... +# ----------------- +# Echo program name prefixed message to standard error. +func_error () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2 +} + + +# func_fatal_error ARG... +# ----------------------- +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + $debug_cmd + + func_error "$*" + exit $EXIT_FAILURE +} + + +# func_grep EXPRESSION FILENAME +# ----------------------------- # Check whether EXPRESSION matches any line of FILENAME, without output. func_grep () { + $debug_cmd + $GREP "$1" "$2" >/dev/null 2>&1 } -# func_mkdir_p directory-path +# func_len STRING +# --------------- +# Set func_len_result to the length of STRING. STRING may not +# start with a hyphen. + test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_len () + { + $debug_cmd + + func_len_result=${#1} + }' +else + func_len () + { + $debug_cmd + + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` + } +fi + + +# func_mkdir_p DIRECTORY-PATH +# --------------------------- # Make sure the entire path to DIRECTORY-PATH is available. func_mkdir_p () { - my_directory_path="$1" - my_dir_list= + $debug_cmd + + _G_directory_path=$1 + _G_dir_list= - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then + if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; + # Protect directory names starting with '-' + case $_G_directory_path in + -*) _G_directory_path=./$_G_directory_path ;; esac # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do + while test ! -d "$_G_directory_path"; do # ...make a list in topmost first order. Use a colon delimited # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" + _G_dir_list=$_G_directory_path:$_G_dir_list # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac + case $_G_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"` done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` + _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'` - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes + func_mkdir_p_IFS=$IFS; IFS=: + for _G_dir in $_G_dir_list; do + IFS=$func_mkdir_p_IFS + # mkdir can fail with a 'File exist' error if two processes # try to create one of the directories concurrently. Don't # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : + $MKDIR "$_G_dir" 2>/dev/null || : done - IFS="$save_mkdir_p_IFS" + IFS=$func_mkdir_p_IFS # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" + test -d "$_G_directory_path" || \ + func_fatal_error "Failed to create '$1'" fi } -# func_mktempdir [string] +# func_mktempdir [BASENAME] +# ------------------------- # Make a temporary directory that won't clash with other running # libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. +# given, BASENAME is the basename for that directory. func_mktempdir () { - my_template="${TMPDIR-/tmp}/${1-$progname}" + $debug_cmd + + _G_template=${TMPDIR-/tmp}/${1-$progname} - if test "$opt_dry_run" = ":"; then + if test : = "$opt_dry_run"; then # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" + _G_tmpdir=$_G_template-$$ else # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null` - if test ! -d "$my_tmpdir"; then + if test ! -d "$_G_tmpdir"; then # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" + _G_tmpdir=$_G_template-${RANDOM-0}$$ + + func_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$_G_tmpdir" + umask $func_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$_G_tmpdir" || \ + func_fatal_error "cannot create temporary directory '$_G_tmpdir'" + fi + + $ECHO "$_G_tmpdir" +} + + +# func_normal_abspath PATH +# ------------------------ +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +func_normal_abspath () +{ + $debug_cmd + + # These SED scripts presuppose an absolute path with a trailing slash. + _G_pathcar='s|^/\([^/]*\).*$|\1|' + _G_pathcdr='s|^/[^/]*||' + _G_removedotparts=':dotsl + s|/\./|/|g + t dotsl + s|/\.$|/|' + _G_collapseslashes='s|/\{1,\}|/|g' + _G_finalslash='s|/*$|/|' + + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"` + while :; do + # Processed it all yet? + if test / = "$func_normal_abspath_tpath"; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result"; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent" + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +} + + +# func_notquiet ARG... +# -------------------- +# Echo program name prefixed message only when not in quiet mode. +func_notquiet () +{ + $debug_cmd + + $opt_quiet || func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + + +# func_relative_path SRCDIR DSTDIR +# -------------------------------- +# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR. +func_relative_path () +{ + $debug_cmd + + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=$func_dirname_result + if test -z "$func_relative_path_tlibdir"; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test -n "$func_stripname_result"; then + func_append func_relative_path_result "/$func_stripname_result" + fi + + # Normalisation. If bindir is libdir, return '.' else relative path. + if test -n "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + fi + + test -n "$func_relative_path_result" || func_relative_path_result=. + + : +} + + +# func_quote_for_eval ARG... +# -------------------------- +# Aesthetically quote ARGs to be evaled later. +# This function returns two values: +# i) func_quote_for_eval_result +# double-quoted, suitable for a subsequent eval +# ii) func_quote_for_eval_unquoted_result +# has all characters that are still active within double +# quotes backslashified. +func_quote_for_eval () +{ + $debug_cmd + + func_quote_for_eval_unquoted_result= + func_quote_for_eval_result= + while test 0 -lt $#; do + case $1 in + *[\\\`\"\$]*) + _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; + *) + _G_unquoted_arg=$1 ;; + esac + if test -n "$func_quote_for_eval_unquoted_result"; then + func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" + else + func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + fi + + case $_G_unquoted_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_quoted_arg=\"$_G_unquoted_arg\" + ;; + *) + _G_quoted_arg=$_G_unquoted_arg + ;; + esac + + if test -n "$func_quote_for_eval_result"; then + func_append func_quote_for_eval_result " $_G_quoted_arg" + else + func_append func_quote_for_eval_result "$_G_quoted_arg" + fi + shift + done +} + + +# func_quote_for_expand ARG +# ------------------------- +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () +{ + $debug_cmd + + case $1 in + *[\\\`\"]*) + _G_arg=`$ECHO "$1" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; + *) + _G_arg=$1 ;; + esac + + case $_G_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_arg=\"$_G_arg\" + ;; + esac + + func_quote_for_expand_result=$_G_arg +} + + +# func_stripname PREFIX SUFFIX NAME +# --------------------------------- +# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_stripname () + { + $debug_cmd + + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary variable first. + func_stripname_result=$3 + func_stripname_result=${func_stripname_result#"$1"} + func_stripname_result=${func_stripname_result%"$2"} + }' +else + func_stripname () + { + $debug_cmd + + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;; + esac + } +fi + + +# func_show_eval CMD [FAIL_EXP] +# ----------------------------- +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. +func_show_eval () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + func_quote_for_expand "$_G_cmd" + eval "func_notquiet $func_quote_for_expand_result" + + $opt_dry_run || { + eval "$_G_cmd" + _G_status=$? + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_show_eval_locale CMD [FAIL_EXP] +# ------------------------------------ +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + $opt_quiet || { + func_quote_for_expand "$_G_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + $opt_dry_run || { + eval "$_G_user_locale + $_G_cmd" + _G_status=$? + eval "$_G_safe_locale" + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_tr_sh +# ---------- +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + $debug_cmd + + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} + + +# func_verbose ARG... +# ------------------- +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $debug_cmd + + $opt_verbose && func_echo "$*" + + : +} + + +# func_warn_and_continue ARG... +# ----------------------------- +# Echo program name prefixed warning message to standard error. +func_warn_and_continue () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2 +} + + +# func_warning CATEGORY ARG... +# ---------------------------- +# Echo program name prefixed warning message to standard error. Warning +# messages can be filtered according to CATEGORY, where this function +# elides messages where CATEGORY is not listed in the global variable +# 'opt_warning_types'. +func_warning () +{ + $debug_cmd + + # CATEGORY must be in the warning_categories list! + case " $warning_categories " in + *" $1 "*) ;; + *) func_internal_error "invalid warning category '$1'" ;; + esac + + _G_category=$1 + shift + + case " $opt_warning_types " in + *" $_G_category "*) $warning_func ${1+"$@"} ;; + esac +} + + +# func_sort_ver VER1 VER2 +# ----------------------- +# 'sort -V' is not generally available. +# Note this deviates from the version comparison in automake +# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a +# but this should suffice as we won't be specifying old +# version formats or redundant trailing .0 in bootstrap.conf. +# If we did want full compatibility then we should probably +# use m4_version_compare from autoconf. +func_sort_ver () +{ + $debug_cmd + + printf '%s\n%s\n' "$1" "$2" \ + | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n +} + +# func_lt_ver PREV CURR +# --------------------- +# Return true if PREV and CURR are in the correct order according to +# func_sort_ver, otherwise false. Use it like this: +# +# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..." +func_lt_ver () +{ + $debug_cmd + + test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q` +} + + +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: +#! /bin/sh + +# Set a version string for this script. +scriptversion=2014-01-07.03; # UTC + +# A portable, pluggable option parser for Bourne shell. +# Written by Gary V. Vaughan, 2010 + +# Copyright (C) 2010-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# This file is a library for parsing options in your shell scripts along +# with assorted other useful supporting features that you can make use +# of too. +# +# For the simplest scripts you might need only: +# +# #!/bin/sh +# . relative/path/to/funclib.sh +# . relative/path/to/options-parser +# scriptversion=1.0 +# func_options ${1+"$@"} +# eval set dummy "$func_options_result"; shift +# ...rest of your script... +# +# In order for the '--version' option to work, you will need to have a +# suitably formatted comment like the one at the top of this file +# starting with '# Written by ' and ending with '# warranty; '. +# +# For '-h' and '--help' to work, you will also need a one line +# description of your script's purpose in a comment directly above the +# '# Written by ' line, like the one at the top of this file. +# +# The default options also support '--debug', which will turn on shell +# execution tracing (see the comment above debug_cmd below for another +# use), and '--verbose' and the func_verbose function to allow your script +# to display verbose messages only when your user has specified +# '--verbose'. +# +# After sourcing this file, you can plug processing for additional +# options by amending the variables from the 'Configuration' section +# below, and following the instructions in the 'Option parsing' +# section further down. + +## -------------- ## +## Configuration. ## +## -------------- ## + +# You should override these variables in your script after sourcing this +# file so that they reflect the customisations you have added to the +# option parser. + +# The usage line for option parsing errors and the start of '-h' and +# '--help' output messages. You can embed shell variables for delayed +# expansion at the time the message is displayed, but you will need to +# quote other shell meta-characters carefully to prevent them being +# expanded when the contents are evaled. +usage='$progpath [OPTION]...' + +# Short help message in response to '-h' and '--help'. Add to this or +# override it after sourcing this library to reflect the full set of +# options your script accepts. +usage_message="\ + --debug enable verbose shell tracing + -W, --warnings=CATEGORY + report the warnings falling in CATEGORY [all] + -v, --verbose verbosely report processing + --version print version information and exit + -h, --help print short or long help message and exit +" + +# Additional text appended to 'usage_message' in response to '--help'. +long_help_message=" +Warning categories include: + 'all' show all warnings + 'none' turn off all the warnings + 'error' warnings are treated as fatal errors" + +# Help message printed before fatal option parsing errors. +fatal_help="Try '\$progname --help' for more information." + + + +## ------------------------- ## +## Hook function management. ## +## ------------------------- ## + +# This section contains functions for adding, removing, and running hooks +# to the main code. A hook is just a named list of of function, that can +# be run in order later on. + +# func_hookable FUNC_NAME +# ----------------------- +# Declare that FUNC_NAME will run hooks added with +# 'func_add_hook FUNC_NAME ...'. +func_hookable () +{ + $debug_cmd + + func_append hookable_fns " $1" +} + + +# func_add_hook FUNC_NAME HOOK_FUNC +# --------------------------------- +# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must +# first have been declared "hookable" by a call to 'func_hookable'. +func_add_hook () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not accept hook functions." ;; + esac + + eval func_append ${1}_hooks '" $2"' +} + + +# func_remove_hook FUNC_NAME HOOK_FUNC +# ------------------------------------ +# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +func_remove_hook () +{ + $debug_cmd + + eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`' +} + + +# func_run_hooks FUNC_NAME [ARG]... +# --------------------------------- +# Run all hook functions registered to FUNC_NAME. +# It is assumed that the list of hook functions contains nothing more +# than a whitespace-delimited list of legal shell function names, and +# no effort is wasted trying to catch shell meta-characters or preserve +# whitespace. +func_run_hooks () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not support hook funcions.n" ;; + esac + + eval _G_hook_fns=\$$1_hooks; shift + + for _G_hook in $_G_hook_fns; do + eval $_G_hook '"$@"' + + # store returned options list back into positional + # parameters for next 'cmd' execution. + eval _G_hook_result=\$${_G_hook}_result + eval set dummy "$_G_hook_result"; shift + done + + func_quote_for_eval ${1+"$@"} + func_run_hooks_result=$func_quote_for_eval_result +} + + + +## --------------- ## +## Option parsing. ## +## --------------- ## + +# In order to add your own option parsing hooks, you must accept the +# full positional parameter list in your hook function, remove any +# options that you action, and then pass back the remaining unprocessed +# options in '_result', escaped suitably for +# 'eval'. Like this: +# +# my_options_prep () +# { +# $debug_cmd +# +# # Extend the existing usage message. +# usage_message=$usage_message' +# -s, --silent don'\''t print informational messages +# ' +# +# func_quote_for_eval ${1+"$@"} +# my_options_prep_result=$func_quote_for_eval_result +# } +# func_add_hook func_options_prep my_options_prep +# +# +# my_silent_option () +# { +# $debug_cmd +# +# # Note that for efficiency, we parse as many options as we can +# # recognise in a loop before passing the remainder back to the +# # caller on the first unrecognised argument we encounter. +# while test $# -gt 0; do +# opt=$1; shift +# case $opt in +# --silent|-s) opt_silent=: ;; +# # Separate non-argument short options: +# -s*) func_split_short_opt "$_G_opt" +# set dummy "$func_split_short_opt_name" \ +# "-$func_split_short_opt_arg" ${1+"$@"} +# shift +# ;; +# *) set dummy "$_G_opt" "$*"; shift; break ;; +# esac +# done +# +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result +# } +# func_add_hook func_parse_options my_silent_option +# +# +# my_option_validation () +# { +# $debug_cmd +# +# $opt_silent && $opt_verbose && func_fatal_help "\ +# '--silent' and '--verbose' options are mutually exclusive." +# +# func_quote_for_eval ${1+"$@"} +# my_option_validation_result=$func_quote_for_eval_result +# } +# func_add_hook func_validate_options my_option_validation +# +# You'll alse need to manually amend $usage_message to reflect the extra +# options you parse. It's preferable to append if you can, so that +# multiple option parsing hooks can be added safely. + + +# func_options [ARG]... +# --------------------- +# All the functions called inside func_options are hookable. See the +# individual implementations for details. +func_hookable func_options +func_options () +{ + $debug_cmd - save_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask - fi + func_options_prep ${1+"$@"} + eval func_parse_options \ + ${func_options_prep_result+"$func_options_prep_result"} + eval func_validate_options \ + ${func_parse_options_result+"$func_parse_options_result"} - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi + eval func_run_hooks func_options \ + ${func_validate_options_result+"$func_validate_options_result"} - $ECHO "$my_tmpdir" + # save modified positional parameters for caller + func_options_result=$func_run_hooks_result } -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () +# func_options_prep [ARG]... +# -------------------------- +# All initialisations required before starting the option parse loop. +# Note that when calling hook functions, we pass through the list of +# positional parameters. If a hook function modifies that list, and +# needs to propogate that back to rest of this script, then the complete +# modified list must be put in 'func_run_hooks_result' before +# returning. +func_hookable func_options_prep +func_options_prep () { - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac + $debug_cmd - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" - ;; - *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac + # Option defaults: + opt_verbose=false + opt_warning_types= + + func_run_hooks func_options_prep ${1+"$@"} + + # save modified positional parameters for caller + func_options_prep_result=$func_run_hooks_result } -# func_quote_for_expand arg -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () +# func_parse_options [ARG]... +# --------------------------- +# The main option parsing loop. +func_hookable func_parse_options +func_parse_options () { - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac + $debug_cmd - case $my_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" - ;; - esac + func_parse_options_result= - func_quote_for_expand_result="$my_arg" -} + # this just eases exit handling + while test $# -gt 0; do + # Defer to hook functions for initial option parsing, so they + # get priority in the event of reusing an option name. + func_run_hooks func_parse_options ${1+"$@"} + # Adjust func_parse_options positional parameters to match + eval set dummy "$func_run_hooks_result"; shift -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. -func_show_eval () -{ - my_cmd="$1" - my_fail_exp="${2-:}" + # Break out of the loop if we already parsed every option. + test $# -gt 0 || break - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + _G_opt=$1 + shift + case $_G_opt in + --debug|-x) debug_cmd='set -x' + func_echo "enabling shell trace mode" + $debug_cmd + ;; + + --no-warnings|--no-warning|--no-warn) + set dummy --warnings none ${1+"$@"} + shift + ;; - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi + --warnings|--warning|-W) + test $# = 0 && func_missing_arg $_G_opt && break + case " $warning_categories $1" in + *" $1 "*) + # trailing space prevents matching last $1 above + func_append_uniq opt_warning_types " $1" + ;; + *all) + opt_warning_types=$warning_categories + ;; + *none) + opt_warning_types=none + warning_func=: + ;; + *error) + opt_warning_types=$warning_categories + warning_func=func_fatal_error + ;; + *) + func_fatal_error \ + "unsupported warning category: '$1'" + ;; + esac + shift + ;; + + --verbose|-v) opt_verbose=: ;; + --version) func_version ;; + -\?|-h) func_usage ;; + --help) func_help ;; + + # Separate optargs to long options (plugins may need this): + --*=*) func_split_equals "$_G_opt" + set dummy "$func_split_equals_lhs" \ + "$func_split_equals_rhs" ${1+"$@"} + shift + ;; + + # Separate optargs to short options: + -W*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + # Separate non-argument short options: + -\?*|-h*|-v*|-x*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + --) break ;; + -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done + + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result } -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. Use the saved locale for evaluation. -func_show_eval_locale () +# func_validate_options [ARG]... +# ------------------------------ +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +func_hookable func_validate_options +func_validate_options () { - my_cmd="$1" - my_fail_exp="${2-:}" + $debug_cmd - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + # Display all warnings if -W was not given. + test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} + func_run_hooks func_validate_options ${1+"$@"} -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac + # Bail if the options were screwed! + $exit_cmd $EXIT_FAILURE + + # save modified positional parameters for caller + func_validate_options_result=$func_run_hooks_result } -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $opt_debug - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? -} +## ----------------- ## +## Helper functions. ## +## ----------------- ## -# func_usage -# Echo short help message to standard output and exit. -func_usage () +# This section contains the helper functions used by the rest of the +# hookable option parser framework in ascii-betical order. + + +# func_fatal_help ARG... +# ---------------------- +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? + eval \$ECHO \""Usage: $usage"\" + eval \$ECHO \""$fatal_help"\" + func_error ${1+"$@"} + exit $EXIT_FAILURE } -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. + +# func_help +# --------- +# Echo long help message to standard output and exit. func_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi + func_usage_message + $ECHO "$long_help_message" + exit 0 } -# func_missing_arg argname + +# func_missing_arg ARGNAME +# ------------------------ # Echo program name prefixed message to standard error and set global # exit_cmd. func_missing_arg () { - $opt_debug + $debug_cmd - func_error "missing argument for $1." + func_error "Missing argument for '$1'." exit_cmd=exit } -# func_split_short_opt shortopt +# func_split_equals STRING +# ------------------------ +# Set func_split_equals_lhs and func_split_equals_rhs shell variables after +# splitting STRING at the '=' sign. +test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=${1%%=*} + func_split_equals_rhs=${1#*=} + test "x$func_split_equals_lhs" = "x$1" \ + && func_split_equals_rhs= + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` + func_split_equals_rhs= + test "x$func_split_equals_lhs" = "x$1" \ + || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` + } +fi #func_split_equals + + +# func_split_short_opt SHORTOPT +# ----------------------------- # Set func_split_short_opt_name and func_split_short_opt_arg shell # variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"} + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` + } +fi #func_split_short_opt + + +# func_usage +# ---------- +# Echo short help message to standard output and exit. +func_usage () { - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + $debug_cmd - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation + func_usage_message + $ECHO "Run '$progname --help |${PAGER-more}' for full usage" + exit 0 +} -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () +# func_usage_message +# ------------------ +# Echo short help message to standard output. +func_usage_message () { - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' + $debug_cmd - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation + eval \$ECHO \""Usage: $usage"\" + echo + $SED -n 's|^# || + /^Written by/{ + x;p;x + } + h + /^Written by/q' < "$progpath" + echo + eval \$ECHO \""$usage_message"\" +} -exit_cmd=: +# func_version +# ------------ +# Echo version message to standard output and exit. +func_version () +{ + $debug_cmd + printf '%s\n' "$progname $scriptversion" + $SED -n ' + /(C)/!b go + :more + /\./!{ + N + s|\n# | | + b more + } + :go + /^# Written by /,/# warranty; / { + s|^# || + s|^# *$|| + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + p + } + /^# Written by / { + s|^# || + p + } + /^warranty; /q' < "$progpath" + exit $? +} -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 +# Set a version string. +scriptversion='(GNU libtool) 2.4.6' -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () +# func_echo ARG... +# ---------------- +# Libtool also displays the current mode in messages, so override +# funclib.sh func_echo with this custom definition. +func_echo () { - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation + $debug_cmd -# func_append_quoted var value -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -func_append_quoted () -{ - func_quote_for_eval "${2}" - eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -} # func_append_quoted may be replaced by extended shell implementation + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line" + done + IFS=$func_echo_IFS +} -# func_arith arithmetic-term... -func_arith () +# func_warning ARG... +# ------------------- +# Libtool warnings are not categorized, so override funclib.sh +# func_warning with this simpler definition. +func_warning () { - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation + $debug_cmd + $warning_func ${1+"$@"} +} -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation +## ---------------- ## +## Options parsing. ## +## ---------------- ## + +# Hook in the functions to make sure our own options are parsed during +# the option parsing loop. + +usage='$progpath [OPTION]... [MODE-ARG]...' + +# Short help message in response to '-h'. +usage_message="Options: + --config show all configuration variables + --debug enable verbose shell tracing + -n, --dry-run display commands without modifying any files + --features display basic configuration information and exit + --mode=MODE use operation mode MODE + --no-warnings equivalent to '-Wnone' + --preserve-dup-deps don't remove duplicate dependency libraries + --quiet, --silent don't print informational messages + --tag=TAG use configuration variables from tag TAG + -v, --verbose print more informational messages than default + --version print version information + -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] + -h, --help, --help-all print short, long, or detailed help message +" -# func_lo2o object -func_lo2o () +# Additional text appended to 'usage_message' in response to '--help'. +func_help () { - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation + $debug_cmd + func_usage_message + $ECHO "$long_help_message -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation +MODE must be one of the following: + + clean remove files from the build directory + compile compile a source file into a libtool object + execute automatically set library path, then run a program + finish complete the installation of libtool libraries + install install libraries or executables + link create a library or an executable + uninstall remove libraries from an installed directory + +MODE-ARGS vary depending on the MODE. When passed as first option, +'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that. +Try '$progname --help --mode=MODE' for a more detailed description of MODE. + +When reporting a bug, please describe a test case to reproduce it and +include the following information: + + host-triplet: $host + shell: $SHELL + compiler: $LTCC + compiler flags: $LTCFLAGS + linker: $LD (gnu? $with_gnu_ld) + version: $progname (GNU libtool) 2.4.6 + automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` + autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` + +Report bugs to . +GNU libtool home page: . +General help using GNU software: ." + exit 0 +} + + +# func_lo2o OBJECT-NAME +# --------------------- +# Transform OBJECT-NAME from a '.lo' suffix to the platform specific +# object suffix. + +lo2o=s/\\.lo\$/.$objext/ +o2lo=s/\\.$objext\$/.lo/ + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_lo2o () + { + case $1 in + *.lo) func_lo2o_result=${1%.lo}.$objext ;; + * ) func_lo2o_result=$1 ;; + esac + }' + + # func_xform LIBOBJ-OR-SOURCE + # --------------------------- + # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise) + # suffix to a '.lo' libtool-object suffix. + eval 'func_xform () + { + func_xform_result=${1%.*}.lo + }' +else + # ...otherwise fall back to using sed. + func_lo2o () + { + func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"` + } + + func_xform () + { + func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'` + } +fi -# func_fatal_configuration arg... +# func_fatal_configuration ARG... +# ------------------------------- # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. func_fatal_configuration () { - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." + func__fatal_error ${1+"$@"} \ + "See the $PACKAGE documentation for more information." \ + "Fatal configuration error." } # func_config +# ----------- # Display the configuration for all the tags in this script. func_config () { @@ -915,17 +2149,19 @@ exit $? } + # func_features +# ------------- # Display the features supported by this script. func_features () { echo "host: $host" - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then echo "enable shared libraries" else echo "disable shared libraries" fi - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then echo "enable static libraries" else echo "disable static libraries" @@ -934,289 +2170,297 @@ exit $? } -# func_enable_tag tagname + +# func_enable_tag TAGNAME +# ----------------------- # Verify that TAGNAME is valid, and either flag an error and exit, or # enable the TAGNAME tag. We also add TAGNAME to the global $taglist # variable here. func_enable_tag () { - # Global variable: - tagname="$1" + # Global variable: + tagname=$1 - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" - - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf=/$re_begincf/,/$re_endcf/p + + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac } + # func_check_version_match +# ------------------------ # Ensure that we are using m4 macros, and libtool script from the same # release of libtool. func_check_version_match () { - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from an older release. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - else - cat >&2 <<_LT_EOF + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from $PACKAGE $macro_version. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - fi - else - cat >&2 <<_LT_EOF + fi + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, $progname: but the definition of this LT_INIT comes from revision $macro_revision. $progname: You should recreate aclocal.m4 with macros from revision $package_revision $progname: of $PACKAGE $VERSION and run autoconf again. _LT_EOF - fi + fi - exit $EXIT_MISMATCH - fi + exit $EXIT_MISMATCH + fi } -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac +# libtool_options_prep [ARG]... +# ----------------------------- +# Preparation for options parsed by libtool. +libtool_options_prep () +{ + $debug_mode + # Option defaults: + opt_config=false + opt_dlopen= + opt_dry_run=false + opt_help=false + opt_mode= + opt_preserve_dup_deps=false + opt_quiet=false + nonopt= + preserve_args= -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; + install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; + link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; + esac + # Pass back the list of options. + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result +} +func_add_hook func_options_prep libtool_options_prep -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do - opt="$1" - shift - case $opt in - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac - shift - ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) - opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false - ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false - ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" - shift - ;; - - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - # Validate options: +# libtool_parse_options [ARG]... +# --------------------------------- +# Provide handling for libtool specific options. +libtool_parse_options () +{ + $debug_cmd - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi + # Perform our own loop to consume as many options as possible in + # each iteration. + while test $# -gt 0; do + _G_opt=$1 + shift + case $_G_opt in + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + + --config) func_config ;; + + --dlopen|-dlopen) + opt_dlopen="${opt_dlopen+$opt_dlopen +}$1" + shift + ;; + + --preserve-dup-deps) + opt_preserve_dup_deps=: ;; + + --features) func_features ;; + + --finish) set dummy --mode finish ${1+"$@"}; shift ;; + + --help) opt_help=: ;; + + --help-all) opt_help=': help-all' ;; + + --mode) test $# = 0 && func_missing_arg $_G_opt && break + opt_mode=$1 + case $1 in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $_G_opt" + exit_cmd=exit + break + ;; + esac + shift + ;; + + --no-silent|--no-quiet) + opt_quiet=false + func_append preserve_args " $_G_opt" + ;; + + --no-warnings|--no-warning|--no-warn) + opt_warning=false + func_append preserve_args " $_G_opt" + ;; + + --no-verbose) + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --silent|--quiet) + opt_quiet=: + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --tag) test $# = 0 && func_missing_arg $_G_opt && break + opt_tag=$1 + func_append preserve_args " $_G_opt $1" + func_enable_tag "$1" + shift + ;; + + --verbose|-v) opt_quiet=false + opt_verbose=: + func_append preserve_args " $_G_opt" + ;; - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - $opt_help || { - # Sanity checks first: - func_check_version_match + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result +} +func_add_hook func_parse_options libtool_parse_options - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE +# libtool_validate_options [ARG]... +# --------------------------------- +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +libtool_validate_options () +{ + # save first non-option argument + if test 0 -lt $#; then + nonopt=$1 + shift fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } + # preserve --debug + test : = "$debug_cmd" || func_append preserve_args " --debug" + + case $host in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + $opt_help || { + # Sanity checks first: + func_check_version_match + + test yes != "$build_libtool_libs" \ + && test yes != "$build_old_libs" \ + && func_fatal_configuration "not configured to build any kind of library" + + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test execute != "$opt_mode"; then + func_error "unrecognized option '-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help=$help + help="Try '$progname --help --mode=$opt_mode' for more information." + } - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE + # Pass back the unparsed argument list + func_quote_for_eval ${1+"$@"} + libtool_validate_options_result=$func_quote_for_eval_result } +func_add_hook func_validate_options libtool_validate_options + +# Process options as early as possible so that --help and --version +# can return quickly. +func_options ${1+"$@"} +eval set dummy "$func_options_result"; shift @@ -1224,24 +2468,52 @@ ## Main. ## ## ----------- ## +magic='%%%MAGIC variable%%%' +magic_exe='%%%MAGIC EXE variable%%%' + +# Global variables. +extracted_archives= +extracted_serial=0 + +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + +# func_generated_by_libtool +# True iff stdin has been generated by Libtool. This function is only +# a basic sanity check; it will hardly flush out determined imposters. +func_generated_by_libtool_p () +{ + $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} + # func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function is only a basic sanity check; it will hardly flush out # determined imposters. func_lalib_p () { test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 + $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p } # func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function implements the same check as func_lalib_p without # resorting to external programs. To this end, it redirects stdin and # closes it afterwards, without saving the original file descriptor. # As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. +# fatal anyway. Works if 'file' does not exist. func_lalib_unsafe_p () { lalib_p=no @@ -1249,13 +2521,13 @@ for lalib_p_l in 1 2 3 4 do read lalib_p_line - case "$lalib_p_line" in + case $lalib_p_line in \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; esac done exec 0<&5 5<&- fi - test "$lalib_p" = yes + test yes = "$lalib_p" } # func_ltwrapper_script_p file @@ -1264,7 +2536,8 @@ # determined imposters. func_ltwrapper_script_p () { - func_lalib_p "$1" + test -f "$1" && + $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p } # func_ltwrapper_executable_p file @@ -1289,7 +2562,7 @@ { func_dirname_and_basename "$1" "" "." func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper } # func_ltwrapper_p file @@ -1308,11 +2581,13 @@ # FAIL_CMD may read-access the current command in variable CMD! func_execute_cmds () { - $opt_debug + $debug_cmd + save_ifs=$IFS; IFS='~' for cmd in $1; do - IFS=$save_ifs + IFS=$sp$nl eval cmd=\"$cmd\" + IFS=$save_ifs func_show_eval "$cmd" "${2-:}" done IFS=$save_ifs @@ -1324,10 +2599,11 @@ # Note that it is not necessary on cygwin/mingw to append a dot to # FILE even if both FILE and FILE.exe exist: automatic-append-.exe # behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. +# 'FILE.' does not work on cygwin managed mounts. func_source () { - $opt_debug + $debug_cmd + case $1 in */* | *\\*) . "$1" ;; *) . "./$1" ;; @@ -1354,10 +2630,10 @@ # store the result into func_replace_sysroot_result. func_replace_sysroot () { - case "$lt_sysroot:$1" in + case $lt_sysroot:$1 in ?*:"$lt_sysroot"*) func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" + func_replace_sysroot_result='='$func_stripname_result ;; *) # Including no sysroot. @@ -1374,7 +2650,8 @@ # arg is usually of the form 'gcc ...' func_infer_tag () { - $opt_debug + $debug_cmd + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -1393,7 +2670,7 @@ for z in $available_tags; do if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. @@ -1418,7 +2695,7 @@ # line option must be used. if test -z "$tagname"; then func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" + func_fatal_error "specify a tag with '--tag'" # else # func_verbose "using $tagname tagged configuration" fi @@ -1434,15 +2711,15 @@ # but don't create it if we're doing a dry run. func_write_libtool_object () { - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' + write_libobj=$1 + if test yes = "$build_libtool_libs"; then + write_lobj=\'$2\' else write_lobj=none fi - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' + if test yes = "$build_old_libs"; then + write_oldobj=\'$3\' else write_oldobj=none fi @@ -1450,7 +2727,7 @@ $opt_dry_run || { cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` + $SED -e "$sed_naive_backslashify"` else func_convert_core_file_wine_to_w32_result= fi @@ -1514,18 +2792,19 @@ # are convertible, then the result may be empty. func_convert_core_path_wine_to_w32 () { - $opt_debug + $debug_cmd + # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" + func_convert_core_path_wine_to_w32_result= if test -n "$1"; then oldIFS=$IFS IFS=: for func_convert_core_path_wine_to_w32_f in $1; do IFS=$oldIFS func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -n "$func_convert_core_file_wine_to_w32_result"; then if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result else func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" fi @@ -1554,7 +2833,8 @@ # environment variable; do not put it in $PATH. func_cygpath () { - $opt_debug + $debug_cmd + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` if test "$?" -ne 0; then @@ -1563,7 +2843,7 @@ fi else func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'" fi } #end: func_cygpath @@ -1574,10 +2854,11 @@ # result in func_convert_core_msys_to_w32_result. func_convert_core_msys_to_w32 () { - $opt_debug + $debug_cmd + # awkward: cmd appends spaces to result func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` + $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` } #end: func_convert_core_msys_to_w32 @@ -1588,13 +2869,14 @@ # func_to_host_file_result to ARG1). func_convert_file_check () { - $opt_debug - if test -z "$2" && test -n "$1" ; then + $debug_cmd + + if test -z "$2" && test -n "$1"; then func_error "Could not determine host file name corresponding to" - func_error " \`$1'" + func_error " '$1'" func_error "Continuing, but uninstalled executables may not work." # Fallback: - func_to_host_file_result="$1" + func_to_host_file_result=$1 fi } # end func_convert_file_check @@ -1606,10 +2888,11 @@ # func_to_host_file_result to a simplistic fallback value (see below). func_convert_path_check () { - $opt_debug + $debug_cmd + if test -z "$4" && test -n "$3"; then func_error "Could not determine the host path corresponding to" - func_error " \`$3'" + func_error " '$3'" func_error "Continuing, but uninstalled executables may not work." # Fallback. This is a deliberately simplistic "conversion" and # should not be "improved". See libtool.info. @@ -1618,7 +2901,7 @@ func_to_host_path_result=`echo "$3" | $SED -e "$lt_replace_pathsep_chars"` else - func_to_host_path_result="$3" + func_to_host_path_result=$3 fi fi } @@ -1630,9 +2913,10 @@ # and appending REPL if ORIG matches BACKPAT. func_convert_path_front_back_pathsep () { - $opt_debug + $debug_cmd + case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" + $1 ) func_to_host_path_result=$3$func_to_host_path_result ;; esac case $4 in @@ -1646,7 +2930,7 @@ ################################################## # $build to $host FILE NAME CONVERSION FUNCTIONS # ################################################## -# invoked via `$to_host_file_cmd ARG' +# invoked via '$to_host_file_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # Result will be available in $func_to_host_file_result. @@ -1657,7 +2941,8 @@ # in func_to_host_file_result. func_to_host_file () { - $opt_debug + $debug_cmd + $to_host_file_cmd "$1" } # end func_to_host_file @@ -1669,7 +2954,8 @@ # in (the comma separated) LAZY, no conversion takes place. func_to_tool_file () { - $opt_debug + $debug_cmd + case ,$2, in *,"$to_tool_file_cmd",*) func_to_tool_file_result=$1 @@ -1687,7 +2973,7 @@ # Copy ARG to func_to_host_file_result. func_convert_file_noop () { - func_to_host_file_result="$1" + func_to_host_file_result=$1 } # end func_convert_file_noop @@ -1698,11 +2984,12 @@ # func_to_host_file_result. func_convert_file_msys_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" + func_to_host_file_result=$func_convert_core_msys_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1714,8 +3001,9 @@ # func_to_host_file_result. func_convert_file_cygwin_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # because $build is cygwin, we call "the" cygpath in $PATH; no need to use # LT_CYGPATH in this case. @@ -1731,11 +3019,12 @@ # and a working winepath. Returns result in func_to_host_file_result. func_convert_file_nix_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result=$func_convert_core_file_wine_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1747,12 +3036,13 @@ # Returns result in func_to_host_file_result. func_convert_file_msys_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1765,13 +3055,14 @@ # in func_to_host_file_result. func_convert_file_nix_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. func_convert_core_file_wine_to_w32 "$1" func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1781,7 +3072,7 @@ ############################################# # $build to $host PATH CONVERSION FUNCTIONS # ############################################# -# invoked via `$to_host_path_cmd ARG' +# invoked via '$to_host_path_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # The result will be available in $func_to_host_path_result. @@ -1805,10 +3096,11 @@ to_host_path_cmd= func_init_to_host_path_cmd () { - $opt_debug + $debug_cmd + if test -z "$to_host_path_cmd"; then func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" + to_host_path_cmd=func_convert_path_$func_stripname_result fi } @@ -1818,7 +3110,8 @@ # in func_to_host_path_result. func_to_host_path () { - $opt_debug + $debug_cmd + func_init_to_host_path_cmd $to_host_path_cmd "$1" } @@ -1829,7 +3122,7 @@ # Copy ARG to func_to_host_path_result. func_convert_path_noop () { - func_to_host_path_result="$1" + func_to_host_path_result=$1 } # end func_convert_path_noop @@ -1840,8 +3133,9 @@ # func_to_host_path_result. func_convert_path_msys_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from ARG. MSYS # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; @@ -1849,7 +3143,7 @@ func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_to_host_path_result=$func_convert_core_msys_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1863,8 +3157,9 @@ # func_to_host_file_result. func_convert_path_cygwin_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" @@ -1883,14 +3178,15 @@ # a working winepath. Returns result in func_to_host_file_result. func_convert_path_nix_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result=$func_convert_core_path_wine_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1904,15 +3200,16 @@ # Returns result in func_to_host_file_result. func_convert_path_msys_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1927,8 +3224,9 @@ # func_to_host_file_result. func_convert_path_nix_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from # ARG. msys behavior is inconsistent here, cygpath turns them @@ -1937,7 +3235,7 @@ func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1946,13 +3244,31 @@ # end func_convert_path_nix_to_cygwin +# func_dll_def_p FILE +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with _LT_DLL_DEF_P in libtool.m4 +func_dll_def_p () +{ + $debug_cmd + + func_dll_def_p_tmp=`$SED -n \ + -e 's/^[ ]*//' \ + -e '/^\(;.*\)*$/d' \ + -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \ + -e q \ + "$1"` + test DEF = "$func_dll_def_p_tmp" +} + + # func_mode_compile arg... func_mode_compile () { - $opt_debug + $debug_cmd + # Get the compilation command and the source file. base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" + srcfile=$nonopt # always keep a non-empty value in "srcfile" suppress_opt=yes suppress_output= arg_mode=normal @@ -1965,12 +3281,12 @@ case $arg_mode in arg ) # do not "continue". Instead, add this to base_compile - lastarg="$arg" + lastarg=$arg arg_mode=normal ;; target ) - libobj="$arg" + libobj=$arg arg_mode=normal continue ;; @@ -1980,7 +3296,7 @@ case $arg in -o) test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" + func_fatal_error "you cannot specify '-o' more than once" arg_mode=target continue ;; @@ -2009,12 +3325,12 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result lastarg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for arg in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_append_quoted lastarg "$arg" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result @@ -2027,8 +3343,8 @@ # Accept the current argument as the source file. # The previous "srcfile" becomes the current argument. # - lastarg="$srcfile" - srcfile="$arg" + lastarg=$srcfile + srcfile=$arg ;; esac # case $arg ;; @@ -2043,13 +3359,13 @@ func_fatal_error "you must specify an argument for -Xcompile" ;; target) - func_fatal_error "you must specify a target with \`-o'" + func_fatal_error "you must specify a target with '-o'" ;; *) # Get the name of the library object. test -z "$libobj" && { func_basename "$srcfile" - libobj="$func_basename_result" + libobj=$func_basename_result } ;; esac @@ -2069,7 +3385,7 @@ case $libobj in *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; *) - func_fatal_error "cannot determine name of library object from \`$libobj'" + func_fatal_error "cannot determine name of library object from '$libobj'" ;; esac @@ -2078,8 +3394,8 @@ for arg in $later; do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes = "$build_libtool_libs" \ + || func_fatal_configuration "cannot build a shared library" build_old_libs=no continue ;; @@ -2105,17 +3421,17 @@ func_quote_for_eval "$libobj" test "X$libobj" != "X$func_quote_for_eval_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." + && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname + objname=$func_basename_result + xdir=$func_dirname_result + lobj=$xdir$objdir/$objname test -z "$base_compile" && \ func_fatal_help "you must specify a compilation command" # Delete any leftover library objects. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then removelist="$obj $lobj $libobj ${libobj}T" else removelist="$lobj $libobj ${libobj}T" @@ -2127,16 +3443,16 @@ pic_mode=default ;; esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then + if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then # non-PIC code in shared libraries is not supported pic_mode=default fi # Calculate the filename of the output object if compiler does # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" + if test no = "$compiler_c_o"; then + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext + lockfile=$output_obj.lock else output_obj= need_locks=no @@ -2145,12 +3461,12 @@ # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then + if test yes = "$need_locks"; then until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" sleep 2 done - elif test "$need_locks" = warn; then + elif test warn = "$need_locks"; then if test -f "$lockfile"; then $ECHO "\ *** ERROR, $lockfile exists and contains: @@ -2158,7 +3474,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2180,11 +3496,11 @@ qsrcfile=$func_quote_for_eval_result # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Without this assignment, base_compile gets emptied. fbsd_hideous_sh_bug=$base_compile - if test "$pic_mode" != no; then + if test no != "$pic_mode"; then command="$base_compile $qsrcfile $pic_flag" else # Don't build PIC code @@ -2201,7 +3517,7 @@ func_show_eval_locale "$command" \ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2212,7 +3528,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2228,20 +3544,20 @@ fi # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then + if test yes = "$suppress_opt"; then suppress_output=' >/dev/null 2>&1' fi fi # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then + if test yes = "$build_old_libs"; then + if test yes != "$pic_mode"; then # Don't build PIC code command="$base_compile $qsrcfile$pie_flag" else command="$base_compile $qsrcfile $pic_flag" fi - if test "$compiler_c_o" = yes; then + if test yes = "$compiler_c_o"; then func_append command " -o $obj" fi @@ -2250,7 +3566,7 @@ func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2261,7 +3577,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2281,7 +3597,7 @@ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" # Unlock the critical section if it was locked - if test "$need_locks" != no; then + if test no != "$need_locks"; then removelist=$lockfile $RM "$lockfile" fi @@ -2291,7 +3607,7 @@ } $opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} + test compile = "$opt_mode" && func_mode_compile ${1+"$@"} } func_mode_help () @@ -2311,7 +3627,7 @@ Remove files from the build directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, object or program, all the files associated @@ -2330,16 +3646,16 @@ -no-suppress do not suppress compiler output for multiple passes -prefer-pic try to build PIC objects only -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking + -shared do not build a '.o' file suitable for static linking + -static only build a '.o' file suitable for static linking -Wc,FLAG pass FLAG directly to the compiler -COMPILE-COMMAND is a command to be used in creating a \`standard' object file +COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." +SOURCEFILE, then substituting the C source code suffix '.c' with the +library object suffix, '.lo'." ;; execute) @@ -2352,7 +3668,7 @@ -dlopen FILE add the directory containing FILE to the library path -This mode sets the library path environment variable according to \`-dlopen' +This mode sets the library path environment variable according to '-dlopen' flags. If any of the ARGS are libtool executable wrappers, then they are translated @@ -2371,7 +3687,7 @@ Each LIBDIR is a directory that contains libtool libraries. The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." +the '--dry-run' option if you just want to see what would be executed." ;; install) @@ -2381,7 +3697,7 @@ Install executables or libraries. INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. +either the 'install' or 'cp' program. The following components of INSTALL-COMMAND are treated specially: @@ -2407,7 +3723,7 @@ -avoid-version do not add a version suffix if possible -bindir BINDIR specify path to binaries directory (for systems where libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime + -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE @@ -2421,7 +3737,8 @@ -no-install link a not-installable executable -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects + -objectlist FILE use a list of object files found in FILE to specify objects + -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes) -precious-files-regex REGEX don't remove output files matching REGEX -release RELEASE specify package release information @@ -2441,20 +3758,20 @@ -Xlinker FLAG pass linker-specific FLAG directly to the linker -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) -All other options (arguments beginning with \`-') are ignored. +All other options (arguments beginning with '-') are ignored. -Every other argument is treated as a filename. Files ending in \`.la' are +Every other argument is treated as a filename. Files ending in '.la' are treated as uninstalled libtool libraries, other files are standard or library object files. -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is +If the OUTPUT-FILE ends in '.la', then a libtool library is created, +only library objects ('.lo' files) may be specified, and '-rpath' is required, except when creating a convenience library. -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. +If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created +using 'ar' and 'ranlib', or on Windows using 'lib'. -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file is created, otherwise an executable program is created." ;; @@ -2465,7 +3782,7 @@ Remove libraries from an installation directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, all the files associated with it are deleted. @@ -2473,17 +3790,17 @@ ;; *) - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" ;; esac echo - $ECHO "Try \`$progname --help' for more information about other modes." + $ECHO "Try '$progname --help' for more information about other modes." } # Now that we've collected a possible --mode arg, show help if necessary if $opt_help; then - if test "$opt_help" = :; then + if test : = "$opt_help"; then func_mode_help else { @@ -2491,7 +3808,7 @@ for opt_mode in compile link execute install finish uninstall clean; do func_mode_help done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' + } | $SED -n '1p; 2,$s/^Usage:/ or: /p' { func_help noexit for opt_mode in compile link execute install finish uninstall clean; do @@ -2499,7 +3816,7 @@ func_mode_help done } | - sed '1d + $SED '1d /^When reporting/,/^Report/{ H d @@ -2516,16 +3833,17 @@ # func_mode_execute arg... func_mode_execute () { - $opt_debug + $debug_cmd + # The first argument is the command name. - cmd="$nonopt" + cmd=$nonopt test -z "$cmd" && \ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. for file in $opt_dlopen; do test -f "$file" \ - || func_fatal_help "\`$file' is not a file" + || func_fatal_help "'$file' is not a file" dir= case $file in @@ -2535,7 +3853,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" + || func_fatal_help "'$lib' is not a valid libtool archive" # Read the libtool library. dlname= @@ -2546,18 +3864,18 @@ if test -z "$dlname"; then # Warn if it was a shared library. test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" + func_warning "'$file' was not linked with '-export-dynamic'" continue fi func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result if test -f "$dir/$objdir/$dlname"; then func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'" fi fi ;; @@ -2565,18 +3883,18 @@ *.lo) # Just add the directory containing the .lo file. func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result ;; *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" + func_warning "'-dlopen' is ignored for non-libtool libraries and objects" continue ;; esac # Get the absolute pathname. absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" + test -n "$absdir" && dir=$absdir # Now add the directory to shlibpath_var. if eval "test -z \"\$$shlibpath_var\""; then @@ -2588,7 +3906,7 @@ # This variable tells wrapper scripts just to set shlibpath_var # rather than running their programs. - libtool_execute_magic="$magic" + libtool_execute_magic=$magic # Check if any of the arguments is a wrapper script. args= @@ -2601,12 +3919,12 @@ if func_ltwrapper_script_p "$file"; then func_source "$file" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program elif func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" func_source "$func_ltwrapper_scriptname_result" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program fi ;; esac @@ -2614,7 +3932,15 @@ func_append_quoted args "$file" done - if test "X$opt_dry_run" = Xfalse; then + if $opt_dry_run; then + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + echo "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + else if test -n "$shlibpath_var"; then # Export the shlibpath_var. eval "export $shlibpath_var" @@ -2631,25 +3957,18 @@ done # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS + exec_cmd=\$cmd$args fi } -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} +test execute = "$opt_mode" && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { - $opt_debug + $debug_cmd + libs= libdirs= admincmds= @@ -2663,11 +3982,11 @@ if func_lalib_unsafe_p "$opt"; then func_append libs " $opt" else - func_warning "\`$opt' is not a valid libtool archive" + func_warning "'$opt' is not a valid libtool archive" fi else - func_fatal_error "invalid argument \`$opt'" + func_fatal_error "invalid argument '$opt'" fi done @@ -2682,12 +4001,12 @@ # Remove sysroot references if $opt_dry_run; then for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + echo "removing references to $lt_sysroot and '=' prefixes from $lib" done else tmpdir=`func_mktempdir` for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ > $tmpdir/tmp-la mv -f $tmpdir/tmp-la $lib done @@ -2712,7 +4031,7 @@ fi # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS + $opt_quiet && exit $EXIT_SUCCESS if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then echo "----------------------------------------------------------------------" @@ -2723,27 +4042,27 @@ echo echo "If you ever happen to want to link against installed libraries" echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "specify the full pathname of the library, or use the '-LLIBDIR'" echo "flag during linking and do at least one of the following:" if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " - add LIBDIR to the '$shlibpath_var' environment variable" echo " during execution" fi if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " - add LIBDIR to the '$runpath_var' environment variable" echo " during linking" fi if test -n "$hardcode_libdir_flag_spec"; then libdir=LIBDIR eval flag=\"$hardcode_libdir_flag_spec\" - $ECHO " - use the \`$flag' linker flag" + $ECHO " - use the '$flag' linker flag" fi if test -n "$admincmds"; then $ECHO " - have your system administrator run these commands:$admincmds" fi if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'" fi echo @@ -2762,18 +4081,20 @@ exit $EXIT_SUCCESS } -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} +test finish = "$opt_mode" && func_mode_finish ${1+"$@"} # func_mode_install arg... func_mode_install () { - $opt_debug + $debug_cmd + # There may be an optional sh(1) argument at the beginning of # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" || # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then + case $nonopt in *shtool*) :;; *) false;; esac + then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -2800,7 +4121,7 @@ opts= prev= install_type= - isdir=no + isdir=false stripme= no_mode=: for arg @@ -2813,7 +4134,7 @@ fi case $arg in - -d) isdir=yes ;; + -d) isdir=: ;; -f) if $install_cp; then :; else prev=$arg @@ -2831,7 +4152,7 @@ *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then + if test X-m = "X$prev" && test -n "$install_override_mode"; then arg2=$install_override_mode no_mode=false fi @@ -2856,7 +4177,7 @@ func_fatal_help "you must specify an install program" test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" + func_fatal_help "the '$prev' option requires an argument" if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else @@ -2878,19 +4199,19 @@ dest=$func_stripname_result # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" + test -d "$dest" && isdir=: + if $isdir; then + destdir=$dest destname= else func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" + destdir=$func_dirname_result + destname=$func_basename_result # Not a directory, so check to see that there is only one file specified. set dummy $files; shift test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" + func_fatal_help "'$dest' is not a directory" fi case $destdir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -2899,7 +4220,7 @@ case $file in *.lo) ;; *) - func_fatal_help "\`$destdir' must be an absolute directory name" + func_fatal_help "'$destdir' must be an absolute directory name" ;; esac done @@ -2908,7 +4229,7 @@ # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic staticlibs= future_libdirs= @@ -2928,7 +4249,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" + || func_fatal_help "'$file' is not a valid libtool archive" library_names= old_library= @@ -2950,7 +4271,7 @@ fi func_dirname "$file" "/" "" - dir="$func_dirname_result" + dir=$func_dirname_result func_append dir "$objdir" if test -n "$relink_command"; then @@ -2964,7 +4285,7 @@ # are installed into $libdir/../bin (currently, that works fine) # but it's something to keep an eye on. test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" + func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. @@ -2973,29 +4294,36 @@ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi - func_warning "relinking \`$file'" + func_warning "relinking '$file'" func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' + 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"' fi # See the names of the shared library. set dummy $library_names; shift if test -n "$1"; then - realname="$1" + realname=$1 shift - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T + srcname=$realname + test -n "$relink_command" && srcname=${realname}T # Install the shared library and build the symlinks. func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' - tstripme="$stripme" + tstripme=$stripme case $host_os in cygwin* | mingw* | pw32* | cegcc*) case $realname in *.dll.a) - tstripme="" + tstripme= + ;; + esac + ;; + os2*) + case $realname in + *_dll.a) + tstripme= ;; esac ;; @@ -3006,7 +4334,7 @@ if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on + # Try 'ln -sf' first, because the 'ln' binary might depend on # the symlink we replace! Solaris /bin/ln does not understand -f, # so we also need to try rm && ln -s. for linkname @@ -3017,14 +4345,14 @@ fi # Do each command in the postinstall commands. - lib="$destdir/$realname" + lib=$destdir/$realname func_execute_cmds "$postinstall_cmds" 'exit $?' fi # Install the pseudo-library for information purposes. func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i + name=$func_basename_result + instname=$dir/${name}i func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. @@ -3036,11 +4364,11 @@ # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # Deduce the name of the destination old-style object file. @@ -3050,11 +4378,11 @@ staticdest=$func_lo2o_result ;; *.$objext) - staticdest="$destfile" + staticdest=$destfile destfile= ;; *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" + func_fatal_help "cannot copy a libtool object to '$destfile'" ;; esac @@ -3063,7 +4391,7 @@ func_show_eval "$install_prog $file $destfile" 'exit $?' # Install the old object if enabled. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then # Deduce the name of the old-style object file. func_lo2o "$file" staticobj=$func_lo2o_result @@ -3075,23 +4403,23 @@ *) # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # If the file is missing, and there is a .exe on the end, strip it # because it is most likely a libtool script we actually want to # install - stripped_ext="" + stripped_ext= case $file in *.exe) if test ! -f "$file"; then func_stripname '' '.exe' "$file" file=$func_stripname_result - stripped_ext=".exe" + stripped_ext=.exe fi ;; esac @@ -3119,19 +4447,19 @@ # Check the variables that should have been set. test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" + func_fatal_error "invalid libtool wrapper script '$wrapper'" - finalize=yes + finalize=: for lib in $notinst_deplibs; do # Check to see that each library is installed. libdir= if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no + func_warning "'$lib' has not been installed in '$libdir'" + finalize=false fi done @@ -3139,29 +4467,29 @@ func_source "$wrapper" outputname= - if test "$fast_install" = no && test -n "$relink_command"; then + if test no = "$fast_install" && test -n "$relink_command"; then $opt_dry_run || { - if test "$finalize" = yes; then + if $finalize; then tmpdir=`func_mktempdir` func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" + file=$func_basename_result + outputname=$tmpdir/$file # Replace the output file specification. relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - $opt_silent || { + $opt_quiet || { func_quote_for_expand "$relink_command" eval "func_echo $func_quote_for_expand_result" } if eval "$relink_command"; then : else - func_error "error: relink \`$file' with the above command before installing it" + func_error "error: relink '$file' with the above command before installing it" $opt_dry_run || ${RM}r "$tmpdir" continue fi - file="$outputname" + file=$outputname else - func_warning "cannot relink \`$file'" + func_warning "cannot relink '$file'" fi } else @@ -3198,10 +4526,10 @@ for file in $staticlibs; do func_basename "$file" - name="$func_basename_result" + name=$func_basename_result # Set up the ranlib parameters. - oldlib="$destdir/$name" + oldlib=$destdir/$name func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 tool_oldlib=$func_to_tool_file_result @@ -3216,18 +4544,18 @@ done test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" + func_warning "remember to run '$progname --finish$future_libdirs'" if test -n "$current_libdirs"; then # Maybe just do a dry run. $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs' else exit $EXIT_SUCCESS fi } -test "$opt_mode" = install && func_mode_install ${1+"$@"} +test install = "$opt_mode" && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -3235,16 +4563,17 @@ # a dlpreopen symbol table. func_generate_dlsyms () { - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + $debug_cmd + + my_outputname=$1 + my_originator=$2 + my_pic_p=${3-false} + my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'` my_dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" + my_dlsyms=${my_outputname}S.c else func_error "not configured to extract global symbols from dlpreopened files" fi @@ -3255,7 +4584,7 @@ "") ;; *.c) # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" + nlist=$output_objdir/$my_outputname.nm func_show_eval "$RM $nlist ${nlist}S ${nlist}T" @@ -3263,34 +4592,36 @@ func_verbose "creating $output_objdir/$my_dlsyms" $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ +/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */ #ifdef __cplusplus extern \"C\" { #endif -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" #endif /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else # define LT_DLSYM_CONST const #endif +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* External symbol declarations for the compiler. */\ " - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" + if test yes = "$dlself"; then + func_verbose "generating symbol list for '$output'" $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" @@ -3298,7 +4629,7 @@ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + func_verbose "extracting global C symbols from '$func_to_tool_file_result'" $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done @@ -3318,10 +4649,10 @@ # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" + export_symbols=$output_objdir/$outputname.exp $opt_dry_run || { $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' @@ -3331,7 +4662,7 @@ } else $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in @@ -3345,22 +4676,22 @@ fi for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" + func_verbose "extracting global C symbols from '$dlprefile'" func_basename "$dlprefile" - name="$func_basename_result" + name=$func_basename_result case $host in *cygwin* | *mingw* | *cegcc* ) # if an import library, we need to obtain dlname if func_win32_import_lib_p "$dlprefile"; then func_tr_sh "$dlprefile" eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" + dlprefile_dlbasename= if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then # Use subshell, to avoid clobbering current variable values dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then + if test -n "$dlprefile_dlname"; then func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" + dlprefile_dlbasename=$func_basename_result else # no lafile. user explicitly requested -dlpreopen . $sharedlib_from_linklib_cmd "$dlprefile" @@ -3368,7 +4699,7 @@ fi fi $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then + if test -n "$dlprefile_dlbasename"; then eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' else func_warning "Could not compute DLL name from $name" @@ -3424,6 +4755,11 @@ echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi + func_show_eval '$RM "${nlist}I"' + if test -n "$global_symbol_to_import"; then + eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I' + fi + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ @@ -3432,11 +4768,30 @@ void *address; } lt_dlsymlist; extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; +lt_${my_prefix}_LTX_preloaded_symbols[];\ +" + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ +static void lt_syminit(void) +{ + LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols; + for (; symbol->name; ++symbol) + {" + $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms" + echo >> "$output_objdir/$my_dlsyms" "\ + } +}" + fi + echo >> "$output_objdir/$my_dlsyms" "\ LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," +{ {\"$my_originator\", (void *) 0}," + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ + {\"@INIT@\", (void *) <_syminit}," + fi case $need_lib_prefix in no) @@ -3478,9 +4833,7 @@ *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi + $my_pic_p && pic_flag_for_symtable=" $pic_flag" ;; esac ;; @@ -3497,10 +4850,10 @@ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"' # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" + symfileobj=$output_objdir/${my_outputname}S.$objext case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then @@ -3518,7 +4871,7 @@ esac ;; *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" + func_fatal_error "unknown suffix for '$my_dlsyms'" ;; esac else @@ -3532,6 +4885,32 @@ fi } +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + # func_win32_libid arg # return the library type of file 'arg' # @@ -3541,8 +4920,9 @@ # Despite the name, also deal with 64 bit binaries. func_win32_libid () { - $opt_debug - win32_libid_type="unknown" + $debug_cmd + + win32_libid_type=unknown win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in *ar\ archive\ import\ library*) # definitely import @@ -3552,16 +4932,29 @@ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' + case $nm_interface in + "MS dumpbin") + if func_cygming_ms_implib_p "$1" || + func_cygming_gnu_implib_p "$1" + then + win32_nmres=import + else + win32_nmres= + fi + ;; + *) + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' 1,100{ / I /{ - s,.*,import, + s|.*|import| p q } }'` + ;; + esac case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -3593,7 +4986,8 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib () { - $opt_debug + $debug_cmd + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` } @@ -3610,7 +5004,8 @@ # specified import library. func_cygming_dll_for_implib_fallback_core () { - $opt_debug + $debug_cmd + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` $OBJDUMP -s --section "$1" "$2" 2>/dev/null | $SED '/^Contents of section '"$match_literal"':/{ @@ -3646,8 +5041,8 @@ /./p' | # we now have a list, one entry per line, of the stringified # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is + # archive that possess that section. Heuristic: eliminate + # all those that have a first or second character that is # a '.' (that is, objdump's representation of an unprintable # character.) This should work for all archives with less than # 0x302f exports -- but will fail for DLLs whose name actually @@ -3658,30 +5053,6 @@ $SED -e '/^\./d;/^.\./d;q' } -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - # func_cygming_dll_for_implib_fallback ARG # Platform-specific function to extract the # name of the DLL associated with the specified @@ -3695,16 +5066,17 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib_fallback () { - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then + $debug_cmd + + if func_cygming_gnu_implib_p "$1"; then # binutils import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then + elif func_cygming_ms_implib_p "$1"; then # ms-generated import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` else # unknown - sharedlib_from_linklib_result="" + sharedlib_from_linklib_result= fi } @@ -3712,10 +5084,11 @@ # func_extract_an_archive dir oldlib func_extract_an_archive () { - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then + $debug_cmd + + f_ex_an_ar_dir=$1; shift + f_ex_an_ar_oldlib=$1 + if test yes = "$lock_old_archive_extraction"; then lockfile=$f_ex_an_ar_oldlib.lock until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" @@ -3724,7 +5097,7 @@ fi func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then + if test yes = "$lock_old_archive_extraction"; then $opt_dry_run || rm -f "$lockfile" fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then @@ -3738,22 +5111,23 @@ # func_extract_archives gentop oldlib ... func_extract_archives () { - $opt_debug - my_gentop="$1"; shift + $debug_cmd + + my_gentop=$1; shift my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" + my_oldobjs= + my_xlib= + my_xabs= + my_xdir= for my_xlib in $my_oldlibs; do # Extract the objects. case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;; *) my_xabs=`pwd`"/$my_xlib" ;; esac func_basename "$my_xlib" - my_xlib="$func_basename_result" + my_xlib=$func_basename_result my_xlib_u=$my_xlib while :; do case " $extracted_archives " in @@ -3765,7 +5139,7 @@ esac done extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" + my_xdir=$my_gentop/$my_xlib_u func_mkdir_p "$my_xdir" @@ -3778,22 +5152,23 @@ cd $my_xdir || exit $? darwin_archive=$my_xabs darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` + func_basename "$darwin_archive" + darwin_base_archive=$func_basename_result darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` if test -n "$darwin_arches"; then darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` darwin_arch= func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" + for darwin_arch in $darwin_arches; do + func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch" + $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive" + cd "unfat-$$/$darwin_base_archive-$darwin_arch" + func_extract_an_archive "`pwd`" "$darwin_base_archive" cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" done # $darwin_arches ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u` darwin_file= darwin_files= for darwin_file in $darwin_filelist; do @@ -3815,7 +5190,7 @@ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done - func_extract_archives_result="$my_oldobjs" + func_extract_archives_result=$my_oldobjs } @@ -3830,7 +5205,7 @@ # # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR # variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is +# will assume that the directory where it is stored is # the $objdir directory. This is a cygwin/mingw-specific # behavior. func_emit_wrapper () @@ -3841,7 +5216,7 @@ #! $SHELL # $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # The $output program cannot be directly executed until all the libtool # libraries that it depends on are installed. @@ -3898,9 +5273,9 @@ # Very basic option parsing. These options are (a) specific to # the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on +# /script/ and the wrapper /executable/ that is used only on # windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match +# (application programs are unlikely to have options that match # this pattern). # # There are only two supported options: --lt-debug and @@ -3933,7 +5308,7 @@ # Print the debug banner immediately: if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2 fi } @@ -3944,7 +5319,7 @@ lt_dump_args_N=1; for lt_arg do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\" lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` done } @@ -3958,7 +5333,7 @@ *-*-mingw | *-*-os2* | *-cegcc*) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} @@ -3968,7 +5343,7 @@ *) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir/\$program\" \${1+\"\$@\"} @@ -4043,13 +5418,13 @@ test -n \"\$absdir\" && thisdir=\"\$absdir\" " - if test "$fast_install" = yes; then + if test yes = "$fast_install"; then $ECHO "\ program=lt-'$outputname'$exeext progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" @@ -4066,7 +5441,7 @@ if test -n \"\$relink_command\"; then if relink_command_output=\`eval \$relink_command 2>&1\`; then : else - $ECHO \"\$relink_command_output\" >&2 + \$ECHO \"\$relink_command_output\" >&2 $RM \"\$progdir/\$file\" exit 1 fi @@ -4101,7 +5476,7 @@ fi # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ # Add our own library path to $shlibpath_var $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" @@ -4121,7 +5496,7 @@ fi else # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 @@ -4140,7 +5515,7 @@ cat < #include +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* declarations of non-ANSI functions */ -#if defined(__MINGW32__) +#if defined __MINGW32__ # ifdef __STRICT_ANSI__ int _putenv (const char *); # endif -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # ifdef __STRICT_ANSI__ char *realpath (const char *, char *); int putenv (char *); int setenv (const char *, const char *, int); # endif -/* #elif defined (other platforms) ... */ +/* #elif defined other_platform || defined ... */ #endif /* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) +#if defined _MSC_VER # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv # define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) +#elif defined __MINGW32__ # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # define HAVE_SETENV # define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ +/* #elif defined other platforms ... */ #endif -#if defined(PATH_MAX) +#if defined PATH_MAX # define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) +#elif defined MAXPATHLEN # define LT_PATHMAX MAXPATHLEN #else # define LT_PATHMAX 1024 @@ -4234,8 +5607,8 @@ # define PATH_SEPARATOR ':' #endif -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) +#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \ + defined __OS2__ # define HAVE_DOS_BASED_FILE_SYSTEM # define FOPEN_WB "wb" # ifndef DIR_SEPARATOR_2 @@ -4268,10 +5641,10 @@ #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ + if (stale) { free (stale); stale = 0; } \ } while (0) -#if defined(LT_DEBUGWRAPPER) +#if defined LT_DEBUGWRAPPER static int lt_debug = 1; #else static int lt_debug = 0; @@ -4300,11 +5673,16 @@ EOF cat < 0) && IS_PATH_SEPARATOR (new_value[len-1])) + size_t len = strlen (new_value); + while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1])) { - new_value[len-1] = '\0'; + new_value[--len] = '\0'; } lt_setenv (name, new_value); XFREE (new_value); @@ -5082,27 +6460,47 @@ # True if ARG is an import lib, as indicated by $file_magic_cmd func_win32_import_lib_p () { - $opt_debug + $debug_cmd + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in *import*) : ;; *) false ;; esac } +# func_suncc_cstd_abi +# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!! +# Several compiler flags select an ABI that is incompatible with the +# Cstd library. Avoid specifying it if any are in CXXFLAGS. +func_suncc_cstd_abi () +{ + $debug_cmd + + case " $compile_command " in + *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*) + suncc_use_cstd_abi=no + ;; + *) + suncc_use_cstd_abi=yes + ;; + esac +} + # func_mode_link arg... func_mode_link () { - $opt_debug + $debug_cmd + case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra + # what system we are compiling for in order to pass an extra # flag for every libtool invocation. # allow_undefined=no # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not + # to make a dll that has undefined symbols, in which case not # even a static library is built. For now, we need to specify # -no-undefined on the libtool link line when we can be certain # that all symbols are satisfied, otherwise we get a static library. @@ -5146,10 +6544,11 @@ module=no no_install=no objs= + os2dllname= non_pic_objects= precious_files_regex= prefer_static_libs=no - preload=no + preload=false prev= prevarg= release= @@ -5161,7 +6560,7 @@ vinfo= vinfo_number=no weak_libs= - single_module="${wl}-single_module" + single_module=$wl-single_module func_infer_tag $base_compile # We need to know -static, to get the right output filenames. @@ -5169,15 +6568,15 @@ do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes != "$build_libtool_libs" \ + && func_fatal_configuration "cannot build a shared library" build_old_libs=no break ;; -all-static | -static | -static-libtool-libs) case $arg in -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then func_warning "complete static linking is impossible in this configuration" fi if test -n "$link_static_flag"; then @@ -5210,7 +6609,7 @@ # Go through the arguments, transforming them on the way. while test "$#" -gt 0; do - arg="$1" + arg=$1 shift func_quote_for_eval "$arg" qarg=$func_quote_for_eval_unquoted_result @@ -5227,21 +6626,21 @@ case $prev in bindir) - bindir="$arg" + bindir=$arg prev= continue ;; dlfiles|dlprefiles) - if test "$preload" = no; then + $preload || { # Add the symbol object into the linking commands. func_append compile_command " @SYMFILE@" func_append finalize_command " @SYMFILE@" - preload=yes - fi + preload=: + } case $arg in *.la | *.lo) ;; # We handle these cases below. force) - if test "$dlself" = no; then + if test no = "$dlself"; then dlself=needless export_dynamic=yes fi @@ -5249,9 +6648,9 @@ continue ;; self) - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then dlself=yes else dlself=needless @@ -5261,7 +6660,7 @@ continue ;; *) - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then func_append dlfiles " $arg" else func_append dlprefiles " $arg" @@ -5272,14 +6671,14 @@ esac ;; expsyms) - export_symbols="$arg" + export_symbols=$arg test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" + || func_fatal_error "symbol file '$arg' does not exist" prev= continue ;; expsyms_regex) - export_symbols_regex="$arg" + export_symbols_regex=$arg prev= continue ;; @@ -5297,7 +6696,13 @@ continue ;; inst_prefix) - inst_prefix_dir="$arg" + inst_prefix_dir=$arg + prev= + continue + ;; + mllvm) + # Clang does not use LLVM to link, so we can simply discard any + # '-mllvm $arg' options when doing the link step. prev= continue ;; @@ -5321,21 +6726,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + if test none != "$pic_object"; then # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5346,7 +6751,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5354,23 +6759,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" + arg=$pic_object fi # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5378,7 +6783,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5386,24 +6791,29 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi done else - func_fatal_error "link input file \`$arg' does not exist" + func_fatal_error "link input file '$arg' does not exist" fi arg=$save_arg prev= continue ;; + os2dllname) + os2dllname=$arg + prev= + continue + ;; precious_regex) - precious_files_regex="$arg" + precious_files_regex=$arg prev= continue ;; release) - release="-$arg" + release=-$arg prev= continue ;; @@ -5415,7 +6825,7 @@ func_fatal_error "only absolute run-paths are allowed" ;; esac - if test "$prev" = rpath; then + if test rpath = "$prev"; then case "$rpath " in *" $arg "*) ;; *) func_append rpath " $arg" ;; @@ -5430,7 +6840,7 @@ continue ;; shrext) - shrext_cmds="$arg" + shrext_cmds=$arg prev= continue ;; @@ -5470,7 +6880,7 @@ esac fi # test -n "$prev" - prevarg="$arg" + prevarg=$arg case $arg in -all-static) @@ -5484,7 +6894,7 @@ -allow-undefined) # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" + func_fatal_error "'-allow-undefined' must not be used because it is the default" ;; -avoid-version) @@ -5516,7 +6926,7 @@ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then func_fatal_error "more than one -exported-symbols argument is not allowed" fi - if test "X$arg" = "X-export-symbols"; then + if test X-export-symbols = "X$arg"; then prev=expsyms else prev=expsyms_regex @@ -5550,9 +6960,9 @@ func_stripname "-L" '' "$arg" if test -z "$func_stripname_result"; then if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" + func_fatal_error "require no space between '-L' and '$1'" else - func_fatal_error "need path for \`-L' option" + func_fatal_error "need path for '-L' option" fi fi func_resolve_sysroot "$func_stripname_result" @@ -5563,8 +6973,8 @@ *) absdir=`cd "$dir" && pwd` test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" + func_fatal_error "cannot determine absolute directory name of '$dir'" + dir=$absdir ;; esac case "$deplibs " in @@ -5599,7 +7009,7 @@ ;; -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + if test X-lc = "X$arg" || test X-lm = "X$arg"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) @@ -5607,11 +7017,11 @@ ;; *-*-os2*) # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework @@ -5620,16 +7030,16 @@ ;; *-*-sco3.2v5* | *-*-sco5v6*) # Causes problems with __ctype - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; esac - elif test "X$arg" = "X-lc_r"; then + elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -5639,6 +7049,11 @@ continue ;; + -mllvm) + prev=mllvm + continue + ;; + -module) module=yes continue @@ -5668,7 +7083,7 @@ ;; -multi_module) - single_module="${wl}-multi_module" + single_module=$wl-multi_module continue ;; @@ -5682,8 +7097,8 @@ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" + func_warning "'-no-install' is ignored for $host" + func_warning "assuming '-no-fast-install' instead" fast_install=no ;; *) no_install=yes ;; @@ -5701,6 +7116,11 @@ continue ;; + -os2dllname) + prev=os2dllname + continue + ;; + -o) prev=output ;; -precious-files-regex) @@ -5788,14 +7208,14 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $func_quote_for_eval_result" func_append compiler_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5804,15 +7224,15 @@ func_stripname '-Wl,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $wl$func_quote_for_eval_result" func_append compiler_flags " $wl$func_quote_for_eval_result" func_append linker_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5835,7 +7255,7 @@ # -msg_* for osf cc -msg_*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; # Flags to be passed through unchanged, with rationale: @@ -5847,25 +7267,46 @@ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC # -F/path path to uninstalled frameworks, gcc on darwin # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # -fstack-protector* stack protector flags for GCC # @file GCC response files # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -stdlib=* select c++ std lib with clang -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" continue ;; + -Z*) + if test os2 = "`expr $host : '.*\(os2\)'`"; then + # OS/2 uses -Zxxx to specify OS/2-specific options + compiler_flags="$compiler_flags $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case $arg in + -Zlinker | -Zstack) + prev=xcompiler + ;; + esac + continue + else + # Otherwise treat like 'Some other compiler flag' below + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + fi + ;; + # Some other compiler flag. -* | +*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; *.$objext) @@ -5886,21 +7327,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + test none = "$pic_object" || { # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5911,7 +7352,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5919,23 +7360,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" - fi + arg=$pic_object + } # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5943,7 +7384,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5951,7 +7392,7 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi ;; @@ -5967,11 +7408,11 @@ # A libtool-controlled library. func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then # This library was specified with -dlopen. func_append dlfiles " $func_resolve_sysroot_result" prev= - elif test "$prev" = dlprefiles; then + elif test dlprefiles = "$prev"; then # The library was specified with -dlpreopen. func_append dlprefiles " $func_resolve_sysroot_result" prev= @@ -5986,7 +7427,7 @@ # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; esac # arg @@ -5998,9 +7439,9 @@ done # argument parsing loop test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" + func_fatal_help "the '$prevarg' option requires an argument" - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then eval arg=\"$export_dynamic_flag_spec\" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6009,20 +7450,23 @@ oldlibs= # calculate the name of the file, without its directory func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" + outputname=$func_basename_result + libobjs_save=$libobjs if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi eval sys_lib_search_path=\"$sys_lib_search_path_spec\" eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + # Definition is injected by LT_CONFIG during libtool generation. + func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH" + func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" + output_objdir=$func_dirname_result$objdir func_to_tool_file "$output_objdir/" tool_output_objdir=$func_to_tool_file_result # Create the object directory. @@ -6045,7 +7489,7 @@ # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6053,7 +7497,7 @@ func_append libs " $deplib" done - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then libs="$predeps $libs $compiler_lib_search_path $postdeps" # Compute libraries that are listed more than once in $predeps @@ -6085,7 +7529,7 @@ case $file in *.la) ;; *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + func_fatal_help "libraries can '-dlopen' only libtool libraries: $file" ;; esac done @@ -6093,7 +7537,7 @@ prog) compile_deplibs= finalize_deplibs= - alldeplibs=no + alldeplibs=false newdlfiles= newdlprefiles= passes="conv scan dlopen dlpreopen link" @@ -6105,29 +7549,29 @@ for pass in $passes; do # The preopen pass in lib mode reverses $deplibs; put it back here # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then + if test lib,link = "$linkmode,$pass"; then ## FIXME: Find the place where the list is rebuilt in the wrong ## order, and fix it there properly tmp_deplibs= for deplib in $deplibs; do tmp_deplibs="$deplib $tmp_deplibs" done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs fi - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass"; then + libs=$deplibs deplibs= fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; + dlopen) libs=$dlfiles ;; + dlpreopen) libs=$dlprefiles ;; link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then + if test lib,dlpreopen = "$linkmode,$pass"; then # Collect and forward deplibs of preopened libtool libs for lib in $dlprefiles; do # Ignore non-libtool-libs @@ -6148,26 +7592,26 @@ esac done done - libs="$dlprefiles" + libs=$dlprefiles fi - if test "$pass" = dlopen; then + if test dlopen = "$pass"; then # Collect dlpreopened libraries - save_deplibs="$deplibs" + save_deplibs=$deplibs deplibs= fi for deplib in $libs; do lib= - found=no + found=false case $deplib in -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6177,13 +7621,13 @@ continue ;; -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" + if test lib != "$linkmode" && test prog != "$linkmode"; then + func_warning "'-l' is ignored for archives/objects" continue fi func_stripname '-l' '' "$deplib" name=$func_stripname_result - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" else searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" @@ -6191,31 +7635,22 @@ for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" + lib=$searchdir/lib$name$search_ext if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes + if test .la = "$search_ext"; then + found=: else - found=no + found=false fi break 2 fi done done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library + if $found; then + # deplib is a libtool library # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $deplib "*) if func_lalib_p "$lib"; then @@ -6223,19 +7658,19 @@ old_library= func_source "$lib" for l in $old_library $library_names; do - ll="$l" + ll=$l done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no + if test "X$ll" = "X$old_library"; then # only static version available + found=false func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" fi continue fi @@ -6244,15 +7679,25 @@ *) ;; esac fi + else + # deplib doesn't seem to be a libtool library + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" + fi + continue fi ;; # -l *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6265,18 +7710,18 @@ case $linkmode in lib) deplibs="$deplib $deplibs" - test "$pass" = conv && continue + test conv = "$pass" && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" func_resolve_sysroot "$func_stripname_result" func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi - if test "$pass" = scan; then + if test scan = "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6287,13 +7732,13 @@ func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) - func_warning "\`-L' is ignored for archives/objects" + func_warning "'-L' is ignored for archives/objects" ;; esac # linkmode continue ;; # -L -R*) - if test "$pass" = link; then + if test link = "$pass"; then func_stripname '-R' '' "$deplib" func_resolve_sysroot "$func_stripname_result" dir=$func_resolve_sysroot_result @@ -6311,7 +7756,7 @@ lib=$func_resolve_sysroot_result ;; *.$libext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi @@ -6322,21 +7767,26 @@ case " $dlpreconveniencelibs " in *" $deplib "*) ;; *) - valid_a_lib=no + valid_a_lib=false case $deplibs_check_method in match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes + valid_a_lib=: fi ;; pass_all) - valid_a_lib=yes + valid_a_lib=: ;; esac - if test "$valid_a_lib" != yes; then + if $valid_a_lib; then + echo + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + else echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." echo "*** I have the capability to make that library automatically link in when" @@ -6344,18 +7794,13 @@ echo "*** shared version of the library, which you do not appear to have" echo "*** because the file extensions .$libext of this argument makes me believe" echo "*** that it is just a static archive that I should not use here." - else - echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" fi ;; esac continue ;; prog) - if test "$pass" != link; then + if test link != "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6366,10 +7811,10 @@ esac # linkmode ;; # *.$libext *.lo | *.$objext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + elif test prog = "$linkmode"; then + if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then # If there is no dlopen support or we're linking statically, # we need to preload. func_append newdlprefiles " $deplib" @@ -6382,22 +7827,20 @@ continue ;; %DEPLIBS%) - alldeplibs=yes + alldeplibs=: continue ;; esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi + $found || test -f "$lib" \ + || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'" # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" + || func_fatal_error "'$lib' is not a valid libtool archive" func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result dlname= dlopen= @@ -6427,30 +7870,30 @@ done fi dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass" || + { test prog != "$linkmode" && test lib != "$linkmode"; }; then test -n "$dlopen" && func_append dlfiles " $dlopen" test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi - if test "$pass" = conv; then + if test conv = "$pass"; then # Only check for convenience libraries deplibs="$lib $deplibs" if test -z "$libdir"; then if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" + elif test prog != "$linkmode" && test lib != "$linkmode"; then + func_fatal_error "'$lib' is not a convenience library" fi tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6464,26 +7907,26 @@ # Get the name of the library we link against. linklib= if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then + { test yes = "$prefer_static_libs" || + test built,no = "$prefer_static_libs,$installed"; }; then linklib=$old_library else for l in $old_library $library_names; do - linklib="$l" + linklib=$l done fi if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi + if test dlopen = "$pass"; then + test -z "$libdir" \ + && func_fatal_error "cannot -dlopen a convenience library: '$lib'" if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then + test yes != "$dlopen_support" || + test no = "$build_libtool_libs" + then # If there is no dlname, no dlopen support or we're linking # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't @@ -6497,40 +7940,40 @@ # We need an absolute path. case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;; *) abs_ladir=`cd "$ladir" && pwd` if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" + func_warning "cannot determine absolute directory name of '$ladir'" func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" + abs_ladir=$ladir fi ;; esac func_basename "$lib" - laname="$func_basename_result" + laname=$func_basename_result # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then + if test yes = "$installed"; then if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" + func_warning "library '$lib' was moved." + dir=$ladir + absdir=$abs_ladir + libdir=$abs_ladir else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" + dir=$lt_sysroot$libdir + absdir=$lt_sysroot$libdir fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + test yes = "$hardcode_automatic" && avoidtemprpath=yes else if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" + dir=$ladir + absdir=$abs_ladir # Remove this search path later func_append notinst_path " $abs_ladir" else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" + dir=$ladir/$objdir + absdir=$abs_ladir/$objdir # Remove this search path later func_append notinst_path " $abs_ladir" fi @@ -6539,11 +7982,11 @@ name=$func_stripname_result # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + if test dlpreopen = "$pass"; then + if test -z "$libdir" && test prog = "$linkmode"; then + func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'" fi - case "$host" in + case $host in # special handling for platforms with PE-DLLs. *cygwin* | *mingw* | *cegcc* ) # Linker will automatically link against shared library if both @@ -6587,9 +8030,9 @@ if test -z "$libdir"; then # Link the convenience library - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then + elif test prog,link = "$linkmode,$pass"; then compile_deplibs="$dir/$old_library $compile_deplibs" finalize_deplibs="$dir/$old_library $finalize_deplibs" else @@ -6599,14 +8042,14 @@ fi - if test "$linkmode" = prog && test "$pass" != link; then + if test prog = "$linkmode" && test link != "$pass"; then func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes + linkalldeplibs=false + if test no != "$link_all_deplibs" || test -z "$library_names" || + test no = "$build_libtool_libs"; then + linkalldeplibs=: fi tmp_libs= @@ -6618,14 +8061,14 @@ ;; esac # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then + if $linkalldeplibs; then deplibs="$deplib $deplibs" else # Need to hardcode shared library paths # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6635,15 +8078,15 @@ continue fi # $linkmode = prog... - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || + { { test no = "$prefer_static_libs" || + test built,yes = "$prefer_static_libs,$installed"; } || test -z "$old_library"; }; then # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in + case $temp_rpath: in *"$absdir:"*) ;; *) func_append temp_rpath "$absdir:" ;; esac @@ -6672,9 +8115,9 @@ esac fi # $linkmode,$pass = prog,link... - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && + if $alldeplibs && + { test pass_all = "$deplibs_check_method" || + { test yes = "$build_libtool_libs" && test -n "$library_names"; }; }; then # We only need to search for static libraries continue @@ -6683,19 +8126,19 @@ link_static=no # Whether the deplib will be linked statically use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then + if test built = "$use_static_libs" && test yes = "$installed"; then use_static_libs=no fi if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then + { test no = "$use_static_libs" || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw* | *cegcc*) + *cygwin* | *mingw* | *cegcc* | *os2*) # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no ;; *) - if test "$installed" = no; then + if test no = "$installed"; then func_append notinst_deplibs " $lib" need_relink=yes fi @@ -6705,24 +8148,24 @@ # Warn about portability, can't link against -module's on some # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" + dlopenmodule= for dlpremoduletest in $dlprefiles; do if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" + dlopenmodule=$dlpremoduletest break fi done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then echo - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else $ECHO "*** Warning: Linking the shared library $output against the loadable module" fi $ECHO "*** $linklib is not portable!" fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then + if test lib = "$linkmode" && + test yes = "$hardcode_into_libs"; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -6750,43 +8193,43 @@ # figure out the soname set dummy $library_names shift - realname="$1" + realname=$1 shift libname=`eval "\\$ECHO \"$libname_spec\""` # use dlname if we got it. it's perfectly good, no? if test -n "$dlname"; then - soname="$dlname" + soname=$dlname elif test -n "$soname_spec"; then # bleh windows case $host in - *cygwin* | mingw* | *cegcc*) + *cygwin* | mingw* | *cegcc* | *os2*) func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; esac eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" + soroot=$soname func_basename "$soroot" - soname="$func_basename_result" + soname=$func_basename_result func_stripname 'lib' '.dll' "$soname" newlib=libimp-$func_stripname_result.a # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : else - func_verbose "extracting exported symbol list from \`$soname'" + func_verbose "extracting exported symbol list from '$soname'" func_execute_cmds "$extract_expsyms_cmds" 'exit $?' fi # Create $newlib if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" + func_verbose "generating import library for '$soname'" func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' fi # make sure the library variables are pointing to the new library @@ -6794,58 +8237,58 @@ linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$opt_mode" != relink; then + if test prog = "$linkmode" || test relink != "$opt_mode"; then add_shlibpath= add_dir= add= lib_linked=yes case $hardcode_action in immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" + if test no = "$hardcode_direct"; then + add=$dir/$linklib case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;; + *-*-sysv4*uw2*) add_dir=-L$dir ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; + *-*-unixware7*) add_dir=-L$dir ;; *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not + # if the lib is a (non-dlopened) module then we cannot # link against it, someone is ignoring the earlier warnings if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then + $GREP ": [^:]* bundle" >/dev/null; then if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then + if test -z "$old_library"; then echo echo "*** And there doesn't seem to be a static archive available" echo "*** The link will probably fail, sorry" else - add="$dir/$old_library" + add=$dir/$old_library fi elif test -n "$old_library"; then - add="$dir/$old_library" + add=$dir/$old_library fi fi esac - elif test "$hardcode_minus_L" = no; then + elif test no = "$hardcode_minus_L"; then case $host in - *-*-sunos*) add_shlibpath="$dir" ;; + *-*-sunos*) add_shlibpath=$dir ;; esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" + add_dir=-L$dir + add=-l$name + elif test no = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi ;; relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$dir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$absdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6854,10 +8297,10 @@ ;; esac fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi @@ -6865,7 +8308,7 @@ *) lib_linked=no ;; esac - if test "$lib_linked" != yes; then + if test yes != "$lib_linked"; then func_fatal_configuration "unsupported hardcode properties" fi @@ -6875,15 +8318,15 @@ *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs" else test -n "$add_dir" && deplibs="$add_dir $deplibs" test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then + if test yes != "$hardcode_direct" && + test yes != "$hardcode_minus_L" && + test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; @@ -6892,33 +8335,33 @@ fi fi - if test "$linkmode" = prog || test "$opt_mode" = relink; then + if test prog = "$linkmode" || test relink = "$opt_mode"; then add_shlibpath= add_dir= add= # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$libdir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$libdir + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then + add=-l$name + elif test yes = "$hardcode_automatic"; then if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" + test -f "$inst_prefix_dir$libdir/$linklib"; then + add=$inst_prefix_dir$libdir/$linklib else - add="$libdir/$linklib" + add=$libdir/$linklib fi else # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" + add_dir=-L$libdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6927,10 +8370,10 @@ ;; esac fi - add="-l$name" + add=-l$name fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else @@ -6938,43 +8381,43 @@ test -n "$add" && deplibs="$add $deplibs" fi fi - elif test "$linkmode" = prog; then + elif test prog = "$linkmode"; then # Here we assume that one of hardcode_direct or hardcode_minus_L # is not unsupported. This is valid on all known static and # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" + if test unsupported != "$hardcode_direct"; then + test -n "$old_library" && linklib=$old_library compile_deplibs="$dir/$linklib $compile_deplibs" finalize_deplibs="$dir/$linklib $finalize_deplibs" else compile_deplibs="-l$name -L$dir $compile_deplibs" finalize_deplibs="-l$name -L$dir $finalize_deplibs" fi - elif test "$build_libtool_libs" = yes; then + elif test yes = "$build_libtool_libs"; then # Not a shared library - if test "$deplibs_check_method" != pass_all; then + if test pass_all != "$deplibs_check_method"; then # We're trying link a shared library against a static one # but the system doesn't support it. # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." + $ECHO "*** Warning: This system cannot link to static lib archive $lib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then + if test yes = "$module"; then echo "*** But as you try to build a module library, libtool will still create " echo "*** a static module, that should work as long as the dlopening application" echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then + if test no = "$build_old_libs"; then build_libtool_libs=module build_old_libs=yes else @@ -6987,11 +8430,11 @@ fi fi # link shared/static library? - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then + { test yes != "$hardcode_into_libs" || + test yes = "$build_old_libs" || + test yes = "$link_static"; }; then # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do @@ -7005,12 +8448,12 @@ *) func_append temp_deplibs " $libdir";; esac done - dependency_libs="$temp_deplibs" + dependency_libs=$temp_deplibs fi func_append newlib_search_path " $absdir" # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do @@ -7020,7 +8463,7 @@ func_resolve_sysroot "$func_stripname_result";; *) func_resolve_sysroot "$deplib" ;; esac - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $func_resolve_sysroot_result "*) func_append specialdeplibs " $func_resolve_sysroot_result" ;; @@ -7029,12 +8472,12 @@ func_append tmp_libs " $func_resolve_sysroot_result" done - if test "$link_all_deplibs" != no; then + if test no != "$link_all_deplibs"; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do path= case $deplib in - -L*) path="$deplib" ;; + -L*) path=$deplib ;; *.la) func_resolve_sysroot "$deplib" deplib=$func_resolve_sysroot_result @@ -7042,12 +8485,12 @@ dir=$func_dirname_result # We need an absolute path. case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;; *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" + func_warning "cannot determine absolute directory name of '$dir'" + absdir=$dir fi ;; esac @@ -7055,35 +8498,35 @@ case $host in *-*-darwin*) depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do + eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names"; then + for tmp in $deplibrary_names; do depdepl=$tmp done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -f "$absdir/$objdir/$depdepl"; then + depdepl=$absdir/$objdir/$depdepl + darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl" + func_append linker_flags " -dylib_file $darwin_install_name:$depdepl" path= fi fi ;; *) - path="-L$absdir/$objdir" + path=-L$absdir/$objdir ;; esac else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" + func_warning "'$deplib' seems to be moved" - path="-L$absdir" + path=-L$absdir fi ;; esac @@ -7095,23 +8538,23 @@ fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then + if test link = "$pass"; then + if test prog = "$linkmode"; then compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then + dependency_libs=$newdependency_libs + if test dlpreopen = "$pass"; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do deplibs="$deplib $deplibs" done fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then + if test dlopen != "$pass"; then + test conv = "$pass" || { # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do @@ -7121,12 +8564,12 @@ esac done newlib_search_path= - fi + } - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else + if test prog,link = "$linkmode,$pass"; then vars="compile_deplibs finalize_deplibs" + else + vars=deplibs fi for var in $vars dependency_libs; do # Add libraries to $var in reverse order @@ -7184,62 +8627,93 @@ eval $var=\"$tmp_libs\" done # for var fi + + # Add Sun CC postdeps if required: + test CXX = "$tagname" && { + case $host_os in + linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C++ 5.9 + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + + solaris*) + func_cc_basename "$CC" + case $func_cc_basename_result in + CC* | sunCC*) + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + esac + } + # Last step: remove runtime libs from dependency_libs # (they stay in deplibs) tmp_libs= - for i in $dependency_libs ; do + for i in $dependency_libs; do case " $predeps $postdeps $compiler_lib_search_path " in *" $i "*) - i="" + i= ;; esac - if test -n "$i" ; then + if test -n "$i"; then func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" + if test prog = "$linkmode"; then + dlfiles=$newdlfiles fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" + if test prog = "$linkmode" || test lib = "$linkmode"; then + dlprefiles=$newdlprefiles fi case $linkmode in oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for archives" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; + func_warning "'-l' and '-L' are ignored for archives" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" + func_warning "'-rpath' is ignored for archives" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" + func_warning "'-R' is ignored for archives" test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" + func_warning "'-version-info/-version-number' is ignored for archives" test -n "$release" && \ - func_warning "\`-release' is ignored for archives" + func_warning "'-release' is ignored for archives" test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" + func_warning "'-export-symbols' is ignored for archives" # Now set the variables for building old libraries. build_libtool_libs=no - oldlibs="$output" + oldlibs=$output func_append objs "$old_deplibs" ;; lib) - # Make sure we only generate libraries of the form `libNAME.la'. + # Make sure we only generate libraries of the form 'libNAME.la'. case $outputname in lib*) func_stripname 'lib' '.la' "$outputname" @@ -7248,10 +8722,10 @@ eval libname=\"$libname_spec\" ;; *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" + test no = "$module" \ + && func_fatal_help "libtool library '$output' must begin with 'lib'" - if test "$need_lib_prefix" != no; then + if test no != "$need_lib_prefix"; then # Add the "lib" prefix for modules if required func_stripname '' '.la' "$outputname" name=$func_stripname_result @@ -7265,8 +8739,8 @@ esac if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" + if test pass_all != "$deplibs_check_method"; then + func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs" else echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" @@ -7275,21 +8749,21 @@ fi fi - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" + test no = "$dlself" \ + || func_warning "'-dlopen self' is ignored for libtool libraries" set dummy $rpath shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" + test 1 -lt "$#" \ + && func_warning "ignoring multiple '-rpath's for a libtool library" - install_libdir="$1" + install_libdir=$1 oldlibs= if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so + # Some compilers have problems with a '.al' extension so # convenience libraries should have the same extension an # archive normally would. oldlibs="$output_objdir/$libname.$libext $oldlibs" @@ -7298,20 +8772,20 @@ fi test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + func_warning "'-version-info/-version-number' is ignored for convenience libraries" test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" + func_warning "'-release' is ignored for convenience libraries" else # Parse the version information argument. - save_ifs="$IFS"; IFS=':' + save_ifs=$IFS; IFS=: set dummy $vinfo 0 0 0 shift - IFS="$save_ifs" + IFS=$save_ifs test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" + func_fatal_help "too many parameters to '-version-info'" # convert absolute version numbers to libtool ages # this retains compatibility with .la files and attempts @@ -7319,42 +8793,42 @@ case $vinfo_number in yes) - number_major="$1" - number_minor="$2" - number_revision="$3" + number_major=$1 + number_minor=$2 + number_revision=$3 # # There are really only two kinds -- those that # use the current revision as the major version # and those that subtract age and use age as # a minor version. But, then there is irix - # which has an extra 1 added just for fun + # that has an extra 1 added just for fun # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) + darwin|freebsd-elf|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_revision" + age=$number_minor + revision=$number_revision ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" + freebsd-aout|qnx|sunos) + current=$number_major + revision=$number_minor + age=0 ;; irix|nonstopux) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_minor" + age=$number_minor + revision=$number_minor lt_irix_increment=no ;; esac ;; no) - current="$1" - revision="$2" - age="$3" + current=$1 + revision=$2 + age=$3 ;; esac @@ -7362,30 +8836,30 @@ case $current in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "CURRENT '$current' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $revision in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "REVISION '$revision' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $age in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' is greater than the current interface number '$current'" + func_fatal_error "'$vinfo' is not valid version information" fi # Calculate the version variables. @@ -7400,26 +8874,36 @@ # verstring for coding it into the library header func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision # Darwin ld doesn't like 0 for these options... func_arith $current + 1 minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + # On Darwin other compilers + case $CC in + nagfor*) + verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" + ;; + *) + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + esac ;; freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; + major=.$current + versuffix=.$current.$revision ;; freebsd-elf) - major=".$current" - versuffix=".$current" + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision ;; irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then + if test no = "$lt_irix_increment"; then func_arith $current - $age else func_arith $current - $age + 1 @@ -7430,69 +8914,74 @@ nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; esac - verstring="$verstring_prefix$major.$revision" + verstring=$verstring_prefix$major.$revision # Add in all the interfaces that we are compatible with. loop=$revision - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $revision - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" + verstring=$verstring_prefix$major.$iface:$verstring done - # Before this point, $major must not contain `.'. + # Before this point, $major must not contain '.'. major=.$major - versuffix="$major.$revision" + versuffix=$major.$revision ;; linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision ;; osf) func_arith $current - $age major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" + versuffix=.$current.$age.$revision + verstring=$current.$age.$revision # Add in all the interfaces that we are compatible with. loop=$age - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $current - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring:${iface}.0" + verstring=$verstring:$iface.0 done # Make executables depend on our current version. - func_append verstring ":${current}.0" + func_append verstring ":$current.0" ;; qnx) - major=".$current" - versuffix=".$current" + major=.$current + versuffix=.$current + ;; + + sco) + major=.$current + versuffix=.$current ;; sunos) - major=".$current" - versuffix=".$current.$revision" + major=.$current + versuffix=.$current.$revision ;; windows) # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. + # extension on DOS 8.3 file systems. func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; *) - func_fatal_configuration "unknown library version type \`$version_type'" + func_fatal_configuration "unknown library version type '$version_type'" ;; esac @@ -7506,42 +8995,45 @@ verstring= ;; *) - verstring="0.0" + verstring=0.0 ;; esac - if test "$need_version" = no; then + if test no = "$need_version"; then versuffix= else - versuffix=".0.0" + versuffix=.0.0 fi fi # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then + if test yes,no = "$avoid_version,$need_version"; then major= versuffix= - verstring="" + verstring= fi # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes + if test yes = "$allow_undefined"; then + if test unsupported = "$allow_undefined_flag"; then + if test yes = "$build_old_libs"; then + func_warning "undefined symbols not allowed in $host shared libraries; building static only" + build_libtool_libs=no + else + func_fatal_error "can't build $host shared library unless -no-undefined is specified" + fi fi else # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" + allow_undefined_flag=$no_undefined_flag fi fi - func_generate_dlsyms "$libname" "$libname" "yes" + func_generate_dlsyms "$libname" "$libname" : func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= + test " " = "$libobjs" && libobjs= - if test "$opt_mode" != relink; then + if test relink != "$opt_mode"; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -7550,8 +9042,8 @@ case $p in *.$objext | *.gcno) ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*) + if test -n "$precious_files_regex"; then if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 then continue @@ -7567,11 +9059,11 @@ fi # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. @@ -7592,13 +9084,13 @@ *) func_append finalize_rpath " $libdir" ;; esac done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then dependency_libs="$temp_xrpath $dependency_libs" fi fi # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" + old_dlfiles=$dlfiles dlfiles= for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in @@ -7608,7 +9100,7 @@ done # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" + old_dlprefiles=$dlprefiles dlprefiles= for lib in $old_dlprefiles; do case "$dlprefiles " in @@ -7617,7 +9109,7 @@ esac done - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then if test -n "$rpath"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) @@ -7641,7 +9133,7 @@ ;; *) # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then + if test yes = "$build_libtool_need_lc"; then func_append deplibs " -lc" fi ;; @@ -7657,9 +9149,9 @@ # I'm not sure if I'm treating the release correctly. I think # release should show up in the -l (ie -lgmp5) so we don't want to # add it in twice. Is that correct? - release="" - versuffix="" - major="" + release= + versuffix= + major= newdeplibs= droppeddeps=no case $deplibs_check_method in @@ -7688,20 +9180,20 @@ -l*) func_stripname -l '' "$i" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7731,20 +9223,20 @@ $opt_dry_run || $RM conftest if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7781,24 +9273,24 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` if test -n "$file_magic_glob"; then libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` else libnameglob=$libname fi - test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` + test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - if test "$want_nocaseglob" = yes; then + if test yes = "$want_nocaseglob"; then shopt -s nocaseglob potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` $nocaseglob @@ -7816,25 +9308,25 @@ # We might still enter an endless loop, since a link # loop can be closed while we follow links, # but so what? - potlib="$potent_lib" + potlib=$potent_lib while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + potliblink=`ls -ld $potlib | $SED 's/.* -> //'` case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;; + *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7842,7 +9334,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7865,30 +9357,30 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test + potlib=$potent_lib # see symlink-check above in file_magic test if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7896,7 +9388,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7912,18 +9404,18 @@ done # Gone through all deplibs. ;; none | unknown | *) - newdeplibs="" + newdeplibs= tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do + if test yes = "$allow_libtool_libs_with_static_runtimes"; then + for i in $predeps $postdeps; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"` done fi case $tmp_deplibs in *[!\ \ ]*) echo - if test "X$deplibs_check_method" = "Xnone"; then + if test none = "$deplibs_check_method"; then echo "*** Warning: inter-library dependencies are not supported in this platform." else echo "*** Warning: inter-library dependencies are not known to be supported." @@ -7947,8 +9439,8 @@ ;; esac - if test "$droppeddeps" = yes; then - if test "$module" = yes; then + if test yes = "$droppeddeps"; then + if test yes = "$module"; then echo echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" @@ -7957,12 +9449,12 @@ if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -7973,14 +9465,14 @@ echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." - if test "$allow_undefined" = no; then + if test no = "$allow_undefined"; then echo echo "*** Since this library must not contain undefined symbols," echo "*** because either the platform does not support them or" echo "*** it was explicitly requested with -no-undefined," echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -8026,7 +9518,7 @@ *) func_append new_libs " $deplib" ;; esac done - deplibs="$new_libs" + deplibs=$new_libs # All the library-specific variables (install_libdir is set above). library_names= @@ -8034,25 +9526,25 @@ dlname= # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. + if test yes = "$build_libtool_libs"; then + # Remove $wl instances when linking with ld. # FIXME: should test the right _cmds variable. case $archive_cmds in *\$LD\ *) wl= ;; esac - if test "$hardcode_into_libs" = yes; then + if test yes = "$hardcode_into_libs"; then # Hardcode the library paths hardcode_libdirs= dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + rpath=$finalize_rpath + test relink = "$opt_mode" || rpath=$compile_rpath$rpath for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then func_replace_sysroot "$libdir" libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8077,7 +9569,7 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then @@ -8091,8 +9583,8 @@ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" fi - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + shlibpath=$finalize_shlibpath + test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -8102,19 +9594,19 @@ eval library_names=\"$library_names_spec\" set dummy $library_names shift - realname="$1" + realname=$1 shift if test -n "$soname_spec"; then eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi if test -z "$dlname"; then dlname=$soname fi - lib="$output_objdir/$realname" + lib=$output_objdir/$realname linknames= for link do @@ -8128,7 +9620,7 @@ delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" + export_symbols=$output_objdir/$libname.uexp func_append delfiles " $export_symbols" fi @@ -8137,31 +9629,31 @@ cygwin* | mingw* | cegcc*) if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then + func_dll_def_p "$export_symbols" || { # and it's NOT already a .def file. Must figure out # which of the given symbols are data symbols and tag # them as such. So, trigger use of export_symbols_cmds. # export_symbols gets reassigned inside the "prepare # the list of exported symbols" if statement, so the # include_expsyms logic still works. - orig_export_symbols="$export_symbols" + orig_export_symbols=$export_symbols export_symbols= always_export_symbols=yes - fi + } fi ;; esac # Prepare the list of exported symbols if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd1 in $cmds; do - IFS="$save_ifs" + IFS=$save_ifs # Take the normal branch if the nm_file_list_spec branch # doesn't work or if tool conversion is not needed. case $nm_file_list_spec~$to_tool_file_cmd in @@ -8175,7 +9667,7 @@ try_normal_branch=no ;; esac - if test "$try_normal_branch" = yes \ + if test yes = "$try_normal_branch" \ && { test "$len" -lt "$max_cmd_len" \ || test "$max_cmd_len" -le -1; } then @@ -8186,7 +9678,7 @@ output_la=$func_basename_result save_libobjs=$libobjs save_output=$output - output=${output_objdir}/${output_la}.nm + output=$output_objdir/$output_la.nm func_to_tool_file "$output" libobjs=$nm_file_list_spec$func_to_tool_file_result func_append delfiles " $output" @@ -8209,8 +9701,8 @@ break fi done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + IFS=$save_ifs + if test -n "$export_symbols_regex" && test : != "$skipped_export"; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' func_show_eval '$MV "${export_symbols}T" "$export_symbols"' fi @@ -8218,16 +9710,16 @@ fi if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then + if test : != "$skipped_export" && test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8246,11 +9738,11 @@ ;; esac done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs if test -n "$convenience"; then if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && + test yes = "$compiler_needs_object" && test -z "$libobjs"; then # extract the archives, so we have objects to list. # TODO: could optimize this to just extract one archive. @@ -8261,7 +9753,7 @@ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" test "X$libobjs" = "X " && libobjs= else - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8270,18 +9762,18 @@ fi fi - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then eval test_cmds=\"$module_expsym_cmds\" cmds=$module_expsym_cmds @@ -8299,7 +9791,7 @@ fi fi - if test "X$skipped_export" != "X:" && + if test : != "$skipped_export" && func_len " $test_cmds" && len=$func_len_result && test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then @@ -8332,8 +9824,8 @@ last_robj= k=1 - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript + if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then + output=$output_objdir/$output_la.lnkscript func_verbose "creating GNU ld script: $output" echo 'INPUT (' > $output for obj in $save_libobjs @@ -8345,14 +9837,14 @@ func_append delfiles " $output" func_to_tool_file "$output" output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk + elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then + output=$output_objdir/$output_la.lnk func_verbose "creating linker input file list: $output" : > $output set x $save_libobjs shift firstobj= - if test "$compiler_needs_object" = yes; then + if test yes = "$compiler_needs_object"; then firstobj="$1 " shift fi @@ -8367,7 +9859,7 @@ else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext eval test_cmds=\"$reload_cmds\" func_len " $test_cmds" len0=$func_len_result @@ -8379,13 +9871,13 @@ func_len " $obj" func_arith $len + $func_len_result len=$func_arith_result - if test "X$objlist" = X || + if test -z "$objlist" || test "$len" -lt "$max_cmd_len"; then func_append objlist " $obj" else # The command $test_cmds is almost too long, add a # command to the queue. - if test "$k" -eq 1 ; then + if test 1 -eq "$k"; then # The first file doesn't have a previous command to add. reload_objs=$objlist eval concat_cmds=\"$reload_cmds\" @@ -8395,10 +9887,10 @@ reload_objs="$objlist $last_robj" eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi - last_robj=$output_objdir/$output_la-${k}.$objext + last_robj=$output_objdir/$output_la-$k.$objext func_arith $k + 1 k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result @@ -8410,9 +9902,9 @@ # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + eval concat_cmds=\"\$concat_cmds$reload_cmds\" if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi func_append delfiles " $output" @@ -8420,9 +9912,9 @@ output= fi - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + ${skipped_export-false} && { + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols libobjs=$output # Append the command to create the export file. @@ -8431,16 +9923,16 @@ if test -n "$last_robj"; then eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi - fi + } test -n "$save_libobjs" && func_verbose "creating a temporary reloadable object file: $output" # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8448,7 +9940,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8457,7 +9949,7 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs if test -n "$export_symbols_regex" && ${skipped_export-false}; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' @@ -8465,18 +9957,18 @@ fi fi - if ${skipped_export-false}; then + ${skipped_export-false} && { if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8485,7 +9977,7 @@ export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi - fi + } libobjs=$output # Restore the value of output. @@ -8499,7 +9991,7 @@ # value of $libobjs for piecewise linking. # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then cmds=$module_expsym_cmds else @@ -8521,7 +10013,7 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -8529,11 +10021,12 @@ test "X$libobjs" = "X " && libobjs= fi - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $cmds; do - IFS="$save_ifs" + IFS=$sp$nl eval cmd=\"$cmd\" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8541,7 +10034,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8550,10 +10043,10 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -8573,39 +10066,39 @@ done # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then + if test yes = "$module" || test yes = "$export_dynamic"; then # On all known operating systems, these are identical. - dlname="$soname" + dlname=$soname fi fi ;; obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for objects" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; + func_warning "'-l' and '-L' are ignored for objects" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" + func_warning "'-rpath' is ignored for objects" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" + func_warning "'-R' is ignored for objects" test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" + func_warning "'-version-info' is ignored for objects" test -n "$release" && \ - func_warning "\`-release' is ignored for objects" + func_warning "'-release' is ignored for objects" case $output in *.lo) test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" + func_fatal_error "cannot build library object '$output' from non-libtool objects" libobj=$output func_lo2o "$libobj" @@ -8613,7 +10106,7 @@ ;; *) libobj= - obj="$output" + obj=$output ;; esac @@ -8626,17 +10119,19 @@ # the extraction. reload_conv_objs= gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - + # if reload_cmds runs $LD directly, get rid of -Wl from + # whole_archive_flag_spec and hope we can get by with turning comma + # into space. + case $reload_cmds in + *\$LD[\ \$]*) wl= ;; + esac if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags else - gentop="$output_objdir/${obj}x" + gentop=$output_objdir/${obj}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8645,12 +10140,12 @@ fi # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + test yes = "$build_libtool_libs" || libobjs=$non_pic_objects # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs - output="$obj" + output=$obj func_execute_cmds "$reload_cmds" 'exit $?' # Exit if we aren't doing a library object file. @@ -8662,7 +10157,7 @@ exit $EXIT_SUCCESS fi - if test "$build_libtool_libs" != yes; then + test yes = "$build_libtool_libs" || { if test -n "$gentop"; then func_show_eval '${RM}r "$gentop"' fi @@ -8672,12 +10167,12 @@ # $show "echo timestamp > $libobj" # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? exit $EXIT_SUCCESS - fi + } - if test -n "$pic_flag" || test "$pic_mode" != default; then + if test -n "$pic_flag" || test default != "$pic_mode"; then # Only do commands if we really have different PIC objects. reload_objs="$libobjs $reload_conv_objs" - output="$libobj" + output=$libobj func_execute_cmds "$reload_cmds" 'exit $?' fi @@ -8694,16 +10189,14 @@ output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" + func_warning "'-version-info' is ignored for programs" test -n "$release" && \ - func_warning "\`-release' is ignored for programs" + func_warning "'-release' is ignored for programs" - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + $preload \ + && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \ + && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support." case $host in *-*-rhapsody* | *-*-darwin1.[012]) @@ -8717,11 +10210,11 @@ *-*-darwin*) # Don't allow lazy linking, it breaks C++ global constructors # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then + if test CXX = "$tagname"; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" + func_append compile_command " $wl-bind_at_load" + func_append finalize_command " $wl-bind_at_load" ;; esac fi @@ -8757,7 +10250,7 @@ *) func_append new_libs " $deplib" ;; esac done - compile_deplibs="$new_libs" + compile_deplibs=$new_libs func_append compile_command " $compile_deplibs" @@ -8781,7 +10274,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8804,7 +10297,7 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; @@ -8821,10 +10314,10 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - compile_rpath="$rpath" + compile_rpath=$rpath rpath= hardcode_libdirs= @@ -8832,7 +10325,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8857,45 +10350,43 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - finalize_rpath="$rpath" + finalize_rpath=$rpath - if test -n "$libobjs" && test "$build_old_libs" = yes; then + if test -n "$libobjs" && test yes = "$build_old_libs"; then # Transform all the library objects into standard objects. compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` fi - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" + func_generate_dlsyms "$outputname" "@PROGRAM@" false # template prelinking step if test -n "$prelink_cmds"; then func_execute_cmds "$prelink_cmds" 'exit $?' fi - wrappers_required=yes + wrappers_required=: case $host in *cegcc* | *mingw32ce*) # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no + wrappers_required=false ;; *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi + test yes = "$build_libtool_libs" || wrappers_required=false ;; *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no + if test no = "$need_relink" || test yes != "$build_libtool_libs"; then + wrappers_required=false fi ;; esac - if test "$wrappers_required" = no; then + $wrappers_required || { # Replace the output file specification. compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" + link_command=$compile_command$compile_rpath # We have no uninstalled library dependencies, so finalize right now. exit_status=0 @@ -8908,12 +10399,12 @@ fi # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' + if test -f "$output_objdir/${outputname}S.$objext"; then + func_show_eval '$RM "$output_objdir/${outputname}S.$objext"' fi exit $exit_status - fi + } if test -n "$compile_shlibpath$finalize_shlibpath"; then compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" @@ -8943,9 +10434,9 @@ fi fi - if test "$no_install" = yes; then + if test yes = "$no_install"; then # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" + link_command=$compile_var$compile_command$compile_rpath # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. @@ -8962,27 +10453,28 @@ exit $EXIT_SUCCESS fi - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi + case $hardcode_action,$fast_install in + relink,*) + # Fast installation is not supported + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + + func_warning "this platform does not like uninstalled shared libraries" + func_warning "'$output' will be relinked during installation" + ;; + *,yes) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + ;; + *,no) + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + ;; + *,needless) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command= + ;; + esac # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` @@ -9039,8 +10531,8 @@ func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" + cwrappersource=$output_path/$objdir/lt-$output_name.c + cwrapper=$output_path/$output_name.exe $RM $cwrappersource $cwrapper trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 @@ -9061,7 +10553,7 @@ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 $opt_dry_run || { # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then + if test "x$build" = "x$host"; then $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result else func_emit_wrapper no > $func_ltwrapper_scriptname_result @@ -9084,25 +10576,27 @@ # See if we need to build an old-fashioned archive. for oldlib in $oldlibs; do - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" + case $build_libtool_libs in + convenience) + oldobjs="$libobjs_save $symfileobj" + addlibs=$convenience build_libtool_libs=no - else + ;; + module) + oldobjs=$libobjs_save + addlibs=$old_convenience + build_libtool_libs=no + ;; + *) oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi + $preload && test -f "$symfileobj" \ + && func_append oldobjs " $symfileobj" + addlibs=$old_convenience + ;; + esac if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $addlibs @@ -9110,13 +10604,13 @@ fi # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then cmds=$old_archive_from_new_cmds else # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -9137,7 +10631,7 @@ : else echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs @@ -9146,7 +10640,7 @@ for obj in $save_oldobjs do func_basename "$obj" - objbase="$func_basename_result" + objbase=$func_basename_result case " $oldobjs " in " ") oldobjs=$obj ;; *[\ /]"$objbase "*) @@ -9215,18 +10709,18 @@ else # the above command should be used before it gets too long oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then + if test "$obj" = "$last_oldobj"; then RANLIB=$save_RANLIB fi test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + eval concat_cmds=\"\$concat_cmds$old_archive_cmds\" objlist= len=$len0 fi done RANLIB=$save_RANLIB oldobjs=$objlist - if test "X$oldobjs" = "X" ; then + if test -z "$oldobjs"; then eval cmds=\"\$concat_cmds\" else eval cmds=\"\$concat_cmds~\$old_archive_cmds\" @@ -9243,7 +10737,7 @@ case $output in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" + test yes = "$build_old_libs" && old_library=$libname.$libext func_verbose "creating $output" # Preserve any variables that may affect compiler behavior @@ -9258,31 +10752,31 @@ fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then + if test yes = "$hardcode_automatic"; then relink_command= fi # Only create the output if not a dry run. $opt_dry_run || { for installed in no yes; do - if test "$installed" = yes; then + if test yes = "$installed"; then if test -z "$install_libdir"; then break fi - output="$output_objdir/$outputname"i + output=$output_objdir/${outputname}i # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= for deplib in $dependency_libs; do case $deplib in *.la) func_basename "$deplib" - name="$func_basename_result" + name=$func_basename_result func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ;; -L*) @@ -9298,23 +10792,23 @@ *) func_append newdependency_libs " $deplib" ;; esac done - dependency_libs="$newdependency_libs" + dependency_libs=$newdependency_libs newdlfiles= for lib in $dlfiles; do case $lib in *.la) func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; *) func_append newdlfiles " $lib" ;; esac done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in @@ -9324,34 +10818,34 @@ # didn't already link the preopened objects directly into # the library: func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles else newdlfiles= for lib in $dlfiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlfiles " $abs" done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlprefiles " $abs" done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles fi $RM $output # place dlname in correct position for cygwin @@ -9367,10 +10861,9 @@ case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then + if test -n "$bindir"; then func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname + tdlname=$func_relative_path_result/$dlname else # Otherwise fall back on heuristic. tdlname=../bin/$dlname @@ -9379,7 +10872,7 @@ esac $ECHO > $output "\ # $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -9393,7 +10886,7 @@ # The name of the static archive. old_library='$old_library' -# Linker flags that can not go in dependency_libs. +# Linker flags that cannot go in dependency_libs. inherited_linker_flags='$new_inherited_linker_flags' # Libraries that this one depends upon. @@ -9419,7 +10912,7 @@ # Directory that this library needs to be installed in: libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then + if test no,yes = "$installed,$need_relink"; then $ECHO >> $output "\ relink_command=\"$relink_command\"" fi @@ -9434,27 +10927,29 @@ exit $EXIT_SUCCESS } -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} +if test link = "$opt_mode" || test relink = "$opt_mode"; then + func_mode_link ${1+"$@"} +fi # func_mode_uninstall arg... func_mode_uninstall () { - $opt_debug - RM="$nonopt" + $debug_cmd + + RM=$nonopt files= - rmforce= + rmforce=false exit_status=0 # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic for arg do case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; + -f) func_append RM " $arg"; rmforce=: ;; -*) func_append RM " $arg" ;; *) func_append files " $arg" ;; esac @@ -9467,18 +10962,18 @@ for file in $files; do func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" + dir=$func_dirname_result + if test . = "$dir"; then + odir=$objdir else - odir="$dir/$objdir" + odir=$dir/$objdir fi func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" + name=$func_basename_result + test uninstall = "$opt_mode" && odir=$dir # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then + if test clean = "$opt_mode"; then case " $rmdirs " in *" $odir "*) ;; *) func_append rmdirs " $odir" ;; @@ -9493,11 +10988,11 @@ elif test -d "$file"; then exit_status=1 continue - elif test "$rmforce" = yes; then + elif $rmforce; then continue fi - rmfiles="$file" + rmfiles=$file case $name in *.la) @@ -9511,7 +11006,7 @@ done test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$opt_mode" in + case $opt_mode in clean) case " $library_names " in *" $dlname "*) ;; @@ -9522,12 +11017,12 @@ uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1' fi if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1' fi # FIXME: should reinstall the best remaining shared library. ;; @@ -9543,21 +11038,19 @@ func_source $dir/$name # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then + if test -n "$pic_object" && test none != "$pic_object"; then func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then + if test -n "$non_pic_object" && test none != "$non_pic_object"; then func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$opt_mode" = clean ; then + if test clean = "$opt_mode"; then noexename=$name case $file in *.exe) @@ -9584,12 +11077,12 @@ # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then + func_append rmfiles " $odir/$name $odir/${name}S.$objext" + if test yes = "$fast_install" && test -n "$relink_command"; then func_append rmfiles " $odir/lt-$name" fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" + if test "X$noexename" != "X$name"; then + func_append rmfiles " $odir/lt-$noexename.c" fi fi fi @@ -9598,7 +11091,7 @@ func_show_eval "$RM $rmfiles" 'exit_status=1' done - # Try to remove the ${objdir}s in the directories where we deleted files + # Try to remove the $objdir's in the directories where we deleted files for dir in $rmdirs; do if test -d "$dir"; then func_show_eval "rmdir $dir >/dev/null 2>&1" @@ -9608,16 +11101,17 @@ exit $exit_status } -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} +if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then + func_mode_uninstall ${1+"$@"} +fi test -z "$opt_mode" && { - help="$generic_help" + help=$generic_help func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" @@ -9628,7 +11122,7 @@ # The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting +# where we disable both kinds of libraries. Given conflicting # choices, we go for a static library, that is the most portable, # since we can't tell whether shared libraries were disabled because # the user asked for that or because the platform doesn't support @@ -9651,5 +11145,3 @@ # mode:shell-script # sh-indentation:2 # End: -# vi:sw=2 - diff -Nru cogl-1.22.0/build/Makefile.in cogl-1.22.2/build/Makefile.in --- cogl-1.22.0/build/Makefile.in 2015-09-16 14:00:51.000000000 +0000 +++ cogl-1.22.2/build/Makefile.in 2016-08-26 17:33:58.000000000 +0000 @@ -344,6 +344,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru cogl-1.22.0/build/win32/Makefile.in cogl-1.22.2/build/win32/Makefile.in --- cogl-1.22.0/build/win32/Makefile.in 2015-09-16 14:00:51.000000000 +0000 +++ cogl-1.22.2/build/win32/Makefile.in 2016-08-26 17:33:58.000000000 +0000 @@ -343,6 +343,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru cogl-1.22.0/build/win32/vs10/Makefile.in cogl-1.22.2/build/win32/vs10/Makefile.in --- cogl-1.22.0/build/win32/vs10/Makefile.in 2015-09-16 14:00:51.000000000 +0000 +++ cogl-1.22.2/build/win32/vs10/Makefile.in 2016-08-26 17:33:58.000000000 +0000 @@ -283,6 +283,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru cogl-1.22.0/build/win32/vs9/Makefile.in cogl-1.22.2/build/win32/vs9/Makefile.in --- cogl-1.22.0/build/win32/vs9/Makefile.in 2015-09-16 14:00:51.000000000 +0000 +++ cogl-1.22.2/build/win32/vs9/Makefile.in 2016-08-26 17:33:58.000000000 +0000 @@ -283,6 +283,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru cogl-1.22.0/cogl/cogl-buffer.h cogl-1.22.2/cogl/cogl-buffer.h --- cogl-1.22.0/cogl/cogl-buffer.h 2015-04-29 16:27:55.000000000 +0000 +++ cogl-1.22.2/cogl/cogl-buffer.h 2016-02-23 12:06:45.000000000 +0000 @@ -89,7 +89,7 @@ * Stability: unstable */ typedef enum { /*< prefix=COGL_BUFFER_ERROR >*/ - COGL_BUFFER_ERROR_MAP, + COGL_BUFFER_ERROR_MAP } CoglBufferError; uint32_t diff -Nru cogl-1.22.0/cogl/cogl-journal.c cogl-1.22.2/cogl/cogl-journal.c --- cogl-1.22.0/cogl/cogl-journal.c 2015-04-29 16:27:55.000000000 +0000 +++ cogl-1.22.2/cogl/cogl-journal.c 2016-02-23 12:06:45.000000000 +0000 @@ -650,7 +650,8 @@ */ state->current_vertex = 0; - if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_JOURNAL))) + if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_JOURNAL)) && + cogl_has_feature (ctx, COGL_FEATURE_ID_MAP_BUFFER_FOR_READ)) { uint8_t *verts; diff -Nru cogl-1.22.0/cogl/cogl.rc cogl-1.22.2/cogl/cogl.rc --- cogl-1.22.0/cogl/cogl.rc 2015-09-16 14:00:56.000000000 +0000 +++ cogl-1.22.2/cogl/cogl.rc 2016-08-26 17:35:02.000000000 +0000 @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,22,0,0 - PRODUCTVERSION 1,22,0,0 + FILEVERSION 1,22,2,0 + PRODUCTVERSION 1,22,2,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Intel Corporation" VALUE "FileDescription", "cogl" - VALUE "FileVersion", "1.22.0.0" + VALUE "FileVersion", "1.22.2.0" VALUE "InternalName", "libcogl-1.0-4" VALUE "LegalCopyright", "Copyright 1995-2011 Intel Corporation" VALUE "OriginalFilename", "libcogl-1.0-4.dll" VALUE "ProductName", "cogl" - VALUE "ProductVersion", "1.22.0" + VALUE "ProductVersion", "1.22.2" END END BLOCK "VarFileInfo" diff -Nru cogl-1.22.0/cogl/driver/gl/cogl-framebuffer-gl.c cogl-1.22.2/cogl/driver/gl/cogl-framebuffer-gl.c --- cogl-1.22.0/cogl/driver/gl/cogl-framebuffer-gl.c 2015-08-06 15:16:30.000000000 +0000 +++ cogl-1.22.2/cogl/driver/gl/cogl-framebuffer-gl.c 2016-02-23 12:06:45.000000000 +0000 @@ -810,7 +810,7 @@ _COGL_RETURN_VAL_IF_FAIL (offscreen->texture_level < _cogl_texture_get_n_levels (offscreen->texture), - NULL); + FALSE); _cogl_texture_get_level_size (offscreen->texture, offscreen->texture_level, diff -Nru cogl-1.22.0/cogl/driver/gl/gles/cogl-driver-gles.c cogl-1.22.2/cogl/driver/gl/gles/cogl-driver-gles.c --- cogl-1.22.0/cogl/driver/gl/gles/cogl-driver-gles.c 2015-04-29 16:27:56.000000000 +0000 +++ cogl-1.22.2/cogl/driver/gl/gles/cogl-driver-gles.c 2016-02-23 12:06:45.000000000 +0000 @@ -404,6 +404,17 @@ COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE, TRUE); } + if (context->glMapBufferRange) + { + /* MapBufferRange in ES3+ does support mapping for read */ + flags |= (COGL_FEATURE_MAP_BUFFER_FOR_WRITE | + COGL_FEATURE_MAP_BUFFER_FOR_READ); + COGL_FLAGS_SET(context->features, + COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE, TRUE); + COGL_FLAGS_SET(context->features, + COGL_FEATURE_ID_MAP_BUFFER_FOR_READ, TRUE); + } + if (context->glEGLImageTargetTexture2D) COGL_FLAGS_SET (private_features, COGL_PRIVATE_FEATURE_TEXTURE_2D_FROM_EGL_IMAGE, TRUE); diff -Nru cogl-1.22.0/cogl/gl-prototypes/cogl-all-functions.h cogl-1.22.2/cogl/gl-prototypes/cogl-all-functions.h --- cogl-1.22.0/cogl/gl-prototypes/cogl-all-functions.h 2015-04-29 16:27:56.000000000 +0000 +++ cogl-1.22.2/cogl/gl-prototypes/cogl-all-functions.h 2016-02-23 12:06:45.000000000 +0000 @@ -295,7 +295,7 @@ COGL_EXT_END () COGL_EXT_BEGIN (map_region, 3, 0, - 0, /* not in either GLES */ + COGL_EXT_IN_GLES3, "ARB:\0", "map_buffer_range\0") COGL_EXT_FUNCTION (GLvoid *, glMapBufferRange, diff -Nru cogl-1.22.0/cogl/Makefile.in cogl-1.22.2/cogl/Makefile.in --- cogl-1.22.0/cogl/Makefile.in 2015-09-16 14:00:52.000000000 +0000 +++ cogl-1.22.2/cogl/Makefile.in 2016-08-26 17:33:59.000000000 +0000 @@ -843,6 +843,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru cogl-1.22.0/cogl/winsys/cogl-winsys-egl.c cogl-1.22.2/cogl/winsys/cogl-winsys-egl.c --- cogl-1.22.0/cogl/winsys/cogl-winsys-egl.c 2015-09-15 12:43:31.000000000 +0000 +++ cogl-1.22.2/cogl/winsys/cogl-winsys-egl.c 2016-08-26 16:18:16.000000000 +0000 @@ -1029,6 +1029,13 @@ egl_ctx = EGL_NO_CONTEXT; else #endif +#if COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT + /* The WL_bind_wayland_display spec states that EGL_NO_CONTEXT is to be used + * in conjunction with the EGL_WAYLAND_BUFFER_WL target */ + if (target == EGL_WAYLAND_BUFFER_WL) + egl_ctx = EGL_NO_CONTEXT; + else +#endif egl_ctx = egl_display->egl_context; return egl_renderer->pf_eglCreateImage (egl_renderer->edpy, diff -Nru cogl-1.22.0/cogl/winsys/cogl-winsys-egl-kms.c cogl-1.22.2/cogl/winsys/cogl-winsys-egl-kms.c --- cogl-1.22.0/cogl/winsys/cogl-winsys-egl-kms.c 2015-09-07 11:08:29.000000000 +0000 +++ cogl-1.22.2/cogl/winsys/cogl-winsys-egl-kms.c 2016-03-14 12:28:23.000000000 +0000 @@ -590,7 +590,7 @@ for (l = kms_display->crtcs; l; l = l->next) { CoglKmsCrtc *crtc = l->data; - int ret; + int ret = 0; if (crtc->count == 0 || crtc->ignore) continue; @@ -610,7 +610,8 @@ } } - flip->pending++; + if (ret == 0) + flip->pending++; } if (kms_renderer->page_flips_not_supported && needs_flip) @@ -662,6 +663,14 @@ return FALSE; } + /* Force a full modeset / drmModeSetCrtc on + * the first swap buffers call. + */ + kms_display->pending_set_crtc = TRUE; + + if (kms_renderer->opened_fd < 0) + return TRUE; + output0 = find_output (0, kms_renderer->fd, resources, @@ -735,10 +744,6 @@ kms_display->width = output0->mode.hdisplay; kms_display->height = output0->mode.vdisplay; - /* We defer setting the crtc modes until the first swap_buffers request of a - * CoglOnscreen framebuffer. */ - kms_display->pending_set_crtc = TRUE; - return TRUE; } @@ -904,7 +909,8 @@ if (kms_onscreen->pending_surface) { free_current_bo (onscreen); - gbm_surface_destroy (kms_onscreen->surface); + if (kms_onscreen->surface) + gbm_surface_destroy (kms_onscreen->surface); kms_onscreen->surface = kms_onscreen->pending_surface; kms_onscreen->pending_surface = NULL; } @@ -1025,6 +1031,15 @@ kms_onscreen = g_slice_new0 (CoglOnscreenKMS); egl_onscreen->platform = kms_onscreen; + /* If a kms_fd is set then the display width and height + * won't be available until cogl_kms_display_set_layout + * is called. In that case, defer creating the surface + * until then. + */ + if (kms_display->width == 0 || + kms_display->height == 0) + return TRUE; + kms_onscreen->surface = gbm_surface_create (kms_renderer->gbm, kms_display->width, @@ -1260,8 +1275,24 @@ if (kms_onscreen->pending_surface) gbm_surface_destroy (kms_onscreen->pending_surface); - kms_onscreen->pending_surface = new_surface; - kms_onscreen->pending_egl_surface = new_egl_surface; + /* If there's already a surface, wait until the next swap to switch + * it out, otherwise, if we're just starting up we can use the new + * surface right away. + */ + if (kms_onscreen->surface != NULL) + { + kms_onscreen->pending_surface = new_surface; + kms_onscreen->pending_egl_surface = new_egl_surface; + } + else + { + CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (kms_display->onscreen); + + kms_onscreen->surface = new_surface; + egl_onscreen->egl_surface = new_egl_surface; + + _cogl_framebuffer_winsys_update_size (framebuffer, width, height); + } } kms_display->width = width; diff -Nru cogl-1.22.0/cogl-gles2/Makefile.in cogl-1.22.2/cogl-gles2/Makefile.in --- cogl-1.22.0/cogl-gles2/Makefile.in 2015-09-16 14:00:51.000000000 +0000 +++ cogl-1.22.2/cogl-gles2/Makefile.in 2016-08-26 17:33:58.000000000 +0000 @@ -376,6 +376,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru cogl-1.22.0/cogl-gst/Makefile.in cogl-1.22.2/cogl-gst/Makefile.in --- cogl-1.22.0/cogl-gst/Makefile.in 2015-09-16 14:00:51.000000000 +0000 +++ cogl-1.22.2/cogl-gst/Makefile.in 2016-08-26 17:33:59.000000000 +0000 @@ -393,6 +393,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru cogl-1.22.0/cogl-pango/cogl-pango.rc cogl-1.22.2/cogl-pango/cogl-pango.rc --- cogl-1.22.0/cogl-pango/cogl-pango.rc 2015-09-16 14:00:56.000000000 +0000 +++ cogl-1.22.2/cogl-pango/cogl-pango.rc 2016-08-26 17:35:02.000000000 +0000 @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,22,0,0 - PRODUCTVERSION 1,22,0,0 + FILEVERSION 1,22,2,0 + PRODUCTVERSION 1,22,2,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Intel Corporation" VALUE "FileDescription", "cogl-pango" - VALUE "FileVersion", "1.22.0.0" + VALUE "FileVersion", "1.22.2.0" VALUE "InternalName", "libcogl-pango-1.0-4" VALUE "LegalCopyright", "Copyright 1995-2011 Intel Corporation" VALUE "OriginalFilename", "libcogl-pango-1.0-4.dll" VALUE "ProductName", "cogl-pango" - VALUE "ProductVersion", "1.22.0" + VALUE "ProductVersion", "1.22.2" END END BLOCK "VarFileInfo" diff -Nru cogl-1.22.0/cogl-pango/Makefile.in cogl-1.22.2/cogl-pango/Makefile.in --- cogl-1.22.0/cogl-pango/Makefile.in 2015-09-16 14:00:51.000000000 +0000 +++ cogl-1.22.2/cogl-pango/Makefile.in 2016-08-26 17:33:59.000000000 +0000 @@ -391,6 +391,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru cogl-1.22.0/cogl-path/Makefile.in cogl-1.22.2/cogl-path/Makefile.in --- cogl-1.22.0/cogl-path/Makefile.in 2015-09-16 14:00:51.000000000 +0000 +++ cogl-1.22.2/cogl-path/Makefile.in 2016-08-26 17:33:59.000000000 +0000 @@ -439,6 +439,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru cogl-1.22.0/config.h.in cogl-1.22.2/config.h.in --- cogl-1.22.0/config.h.in 2015-09-16 14:00:50.000000000 +0000 +++ cogl-1.22.2/config.h.in 2016-08-26 17:33:57.000000000 +0000 @@ -109,11 +109,11 @@ /* Define to 1 if you have the header file. */ #undef HAVE_CE4100_LIBGDL_H -/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework. */ #undef HAVE_CFLOCALECOPYCURRENT -/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework. */ #undef HAVE_CFPREFERENCESCOPYAPPVALUE @@ -475,8 +475,7 @@ /* Have a working bcopy */ #undef HAVE_WORKING_BCOPY -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* global 'sys_errlist' not found */ diff -Nru cogl-1.22.0/config.h.win32 cogl-1.22.2/config.h.win32 --- cogl-1.22.0/config.h.win32 2015-09-16 14:00:56.000000000 +0000 +++ cogl-1.22.2/config.h.win32 2016-08-26 17:35:02.000000000 +0000 @@ -519,7 +519,7 @@ #define PACKAGE_NAME "cogl" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "cogl 1.22.0" +#define PACKAGE_STRING "cogl 1.22.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "cogl" @@ -528,7 +528,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.22.0" +#define PACKAGE_VERSION "1.22.2" /* Maximum POSIX RT priority */ /* #undef POSIX_MAX_PRIORITY */ diff -Nru cogl-1.22.0/configure cogl-1.22.2/configure --- cogl-1.22.0/configure 2015-09-16 14:00:50.000000000 +0000 +++ cogl-1.22.2/configure 2016-08-26 17:33:56.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for cogl 1.22.0. +# Generated by GNU Autoconf 2.69 for cogl 1.22.2. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='cogl' PACKAGE_TARNAME='cogl' -PACKAGE_VERSION='1.22.0' -PACKAGE_STRING='cogl 1.22.0' +PACKAGE_VERSION='1.22.2' +PACKAGE_STRING='cogl 1.22.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -821,6 +821,7 @@ OS_WIN32_TRUE LIBM CXXCPP +LT_SYS_LIBRARY_PATH OTOOL64 OTOOL LIPO @@ -974,6 +975,7 @@ enable_shared with_pic enable_fast_install +with_aix_soname with_gnu_ld with_sysroot enable_libtool_lock @@ -1037,6 +1039,7 @@ CXX CXXFLAGS CCC +LT_SYS_LIBRARY_PATH CXXCPP PKG_CONFIG PKG_CONFIG_PATH @@ -1604,7 +1607,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 cogl 1.22.0 to adapt to many kinds of systems. +\`configure' configures cogl 1.22.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1678,7 +1681,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of cogl 1.22.0:";; + short | recursive ) echo "Configuration of cogl 1.22.2:";; esac cat <<\_ACEOF @@ -1776,15 +1779,18 @@ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). --with-gl-libname override the name of the GL library to dlopen --with-gles1-libname override the name of the GLESv1 library to dlopen --with-gles2-libname override the name of the GLESv2 library to dlopen --with-default-driver specify a default cogl driver --with-html-dir=PATH path to installed docs - --with-gnu-ld assume the C compiler uses GNU ld default=no + --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib --without-libiconv-prefix don't search for libiconv in includedir and libdir --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib @@ -1802,6 +1808,8 @@ CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. CXXCPP C++ preprocessor PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH @@ -1915,7 +1923,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -cogl configure 1.22.0 +cogl configure 1.22.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2687,7 +2695,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by cogl $as_me 1.22.0, which was +It was created by cogl $as_me 1.22.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4970,7 +4978,7 @@ # Define the identity of the package. PACKAGE='cogl' - VERSION='1.22.0' + VERSION='1.22.2' # Some tools Automake needs. @@ -5355,15 +5363,15 @@ COGL_1_MINOR_VERSION=22 -COGL_1_MICRO_VERSION=0 +COGL_1_MICRO_VERSION=2 -COGL_1_VERSION=1.22.0 +COGL_1_VERSION=1.22.2 COGL_LT_CURRENT=24 -COGL_LT_REVISION=1 +COGL_LT_REVISION=2 COGL_LT_AGE=4 @@ -6667,8 +6675,8 @@ -macro_version='2.4.2' -macro_revision='1.3337' +macro_version='2.4.6' +macro_revision='2.4.6' @@ -6682,7 +6690,7 @@ -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -6802,7 +6810,7 @@ $ECHO "" } -case "$ECHO" in +case $ECHO in printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 $as_echo "printf" >&6; } ;; print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 @@ -6995,19 +7003,19 @@ # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -7021,7 +7029,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -7032,7 +7040,7 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -7043,32 +7051,32 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -7111,33 +7119,38 @@ else if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -7148,15 +7161,15 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : @@ -7262,9 +7275,9 @@ fi fi - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -7272,8 +7285,8 @@ esac fi - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -7324,7 +7337,7 @@ $as_echo_n "(cached) " >&6 else i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -7364,7 +7377,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -7414,22 +7427,23 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -7447,7 +7461,7 @@ fi -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else @@ -7465,30 +7479,6 @@ : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } - - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else @@ -7611,13 +7601,13 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then + if test yes != "$GCC"; then reload_cmds=false fi ;; darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + if test yes = "$GCC"; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -7745,13 +7735,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[4-9]*) @@ -7778,8 +7768,7 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -7815,10 +7804,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -7857,7 +7842,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -7879,8 +7864,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' @@ -7933,6 +7918,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac fi @@ -8090,8 +8078,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -8103,7 +8091,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac @@ -8257,7 +8245,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 @@ -8265,7 +8253,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -8278,7 +8266,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 $as_echo "$lt_cv_ar_at_file" >&6; } -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -8495,7 +8483,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -8585,7 +8573,7 @@ symcode='[ABCDGISTW]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[ABCDEGRST]' fi ;; @@ -8618,14 +8606,44 @@ symcode='[ABCDGIRSTW]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -8643,21 +8661,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -8705,11 +8726,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else @@ -8735,7 +8756,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -8755,13 +8776,13 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext}; then + test $ac_status = 0; } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -8782,7 +8803,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -8835,6 +8856,16 @@ + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -8847,9 +8878,9 @@ lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -8859,8 +8890,8 @@ no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +$as_echo "$with_sysroot" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac @@ -8872,18 +8903,99 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +$as_echo_n "checking for a working dd... " >&6; } +if ${ac_cv_path_lt_DD+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +if test -z "$lt_DD"; then + ac_path_lt_DD_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in dd; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_lt_DD" || continue +if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi + $ac_path_lt_DD_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_lt_DD"; then + : + fi +else + ac_cv_path_lt_DD=$lt_DD +fi + +rm -f conftest.i conftest2.i conftest.out +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +$as_echo "$ac_cv_path_lt_DD" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +$as_echo_n "checking how to truncate binary pipes... " >&6; } +if ${lt_cv_truncate_bin+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +$as_echo "$lt_cv_truncate_bin" >&6; } + + + + + + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -8892,24 +9004,25 @@ test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '#line '$LINENO' "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -8938,9 +9051,50 @@ rm -rf conftest* ;; +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -8954,7 +9108,14 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" @@ -8999,7 +9160,7 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } @@ -9039,13 +9200,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -9057,7 +9219,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -9066,7 +9228,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -9082,7 +9244,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. @@ -9193,7 +9355,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 $as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi @@ -9696,7 +9858,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -9714,7 +9876,7 @@ cat conftest.err >&5 # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -9753,7 +9915,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 @@ -9782,7 +9944,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -9795,32 +9957,32 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -9828,6 +9990,41 @@ ;; esac +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + for ac_header in dlfcn.h do : ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default @@ -9846,9 +10043,9 @@ func_stripname_cnf () { - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;; esac } # func_stripname_cnf @@ -9866,14 +10063,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -9904,14 +10101,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -9936,14 +10133,14 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -9951,8 +10148,6 @@ fi -test -z "$pic_mode" && pic_mode=default - @@ -9968,14 +10163,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -9989,11 +10184,63 @@ + shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[5-9]*,yes) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } + +# Check whether --with-aix-soname was given. +if test "${with_aix_soname+set}" = set; then : + withval=$with_aix_soname; case $withval in + aix|svr4|both) + ;; + *) + as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname +else + if ${lt_cv_with_aix_soname+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_with_aix_soname=aix +fi + + with_aix_soname=$lt_cv_with_aix_soname +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +$as_echo "$with_aix_soname" >&6; } + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + + + + + + + # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -10042,7 +10289,7 @@ -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -10081,7 +10328,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -10092,14 +10339,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -10108,15 +10355,8 @@ test -z "$LD" && LD=ld test -z "$ac_objext" && ac_objext=o -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +func_cc_basename $compiler +cc_basename=$func_cc_basename_result # Only perform the check for file, if the check method requires it @@ -10131,22 +10371,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -f "$ac_dir/${ac_tool_prefix}file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -10169,13 +10409,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -10197,22 +10437,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -f "$ac_dir/file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -10235,13 +10475,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -10262,7 +10502,7 @@ # Use C for the default configuration in the libtool script -lt_save_CC="$CC" +lt_save_CC=$CC ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -10324,7 +10564,7 @@ lt_prog_compiler_no_builtin_flag= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; @@ -10340,7 +10580,7 @@ lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" + lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -10370,7 +10610,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" else : @@ -10388,17 +10628,18 @@ lt_prog_compiler_static= - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_prog_compiler_wl='-Wl,' lt_prog_compiler_static='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' fi + lt_prog_compiler_pic='-fPIC' ;; amigaos*) @@ -10409,8 +10650,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -10426,6 +10667,11 @@ # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -10496,7 +10742,7 @@ case $host_os in aix*) lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' else @@ -10504,10 +10750,29 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -10523,7 +10788,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' + lt_prog_compiler_static='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -10532,9 +10797,9 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' @@ -10559,6 +10824,12 @@ lt_prog_compiler_pic='-PIC' lt_prog_compiler_static='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -10656,7 +10927,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then lt_prog_compiler_pic='-Kconform_pic' lt_prog_compiler_static='-Bstatic' fi @@ -10685,7 +10956,7 @@ fi case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= ;; @@ -10717,7 +10988,7 @@ lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -10747,7 +11018,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_pic_works"; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -10779,7 +11050,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -10798,13 +11069,13 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_cv_prog_compiler_static_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_static_works"; then : else lt_prog_compiler_static= @@ -10924,8 +11195,8 @@ -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -10937,9 +11208,9 @@ ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -10982,9 +11253,9 @@ # included in the symbol list include_expsyms= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -10999,7 +11270,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -11007,7 +11278,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -11017,7 +11288,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -11039,24 +11310,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + export_dynamic_flag_spec='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -11069,7 +11340,7 @@ case $host_os in aix[3-9]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then ld_shlibs=no cat <<_LT_EOF 1>&2 @@ -11088,7 +11359,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -11104,7 +11375,7 @@ allow_undefined_flag=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else ld_shlibs=no fi @@ -11114,7 +11385,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' + export_dynamic_flag_spec='$wl--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -11122,61 +11393,89 @@ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs=no fi ;; haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' link_all_deplibs=yes ;; + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -11187,42 +11486,47 @@ lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + export_dynamic_flag_spec='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -11236,8 +11540,8 @@ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -11255,8 +11559,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -11268,7 +11572,7 @@ ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -11283,9 +11587,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -11302,15 +11606,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi ;; esac - if test "$ld_shlibs" = no; then + if test no = "$ld_shlibs"; then runpath_var= hardcode_libdir_flag_spec= export_dynamic_flag_spec= @@ -11326,7 +11630,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -11334,34 +11638,57 @@ ;; aix[4-9]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -11380,13 +11707,21 @@ hardcode_direct_absolute=yes hardcode_libdir_separator=':' link_all_deplibs=yes - file_list_spec='${wl}-f,' + file_list_spec='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct=no + hardcode_direct_absolute=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -11405,35 +11740,42 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec='${wl}-bexpall' + export_dynamic_flag_spec='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -11468,7 +11810,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -11476,17 +11818,17 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -11521,7 +11863,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -11529,21 +11871,33 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + no_undefined_flag=' $wl-bernotok' + allow_undefined_flag=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec='$convenience' fi archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -11552,7 +11906,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -11582,16 +11936,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes @@ -11600,18 +11955,18 @@ # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -11620,7 +11975,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -11639,24 +11994,24 @@ hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else whole_archive_flag_spec='' fi link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" + allow_undefined_flag=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -11698,33 +12053,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes @@ -11732,25 +12087,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -11762,7 +12117,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -b" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -11781,14 +12136,14 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 $as_echo "$lt_cv_prog_compiler__b" >&6; } -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +if test yes = "$lt_cv_prog_compiler__b"; then + archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi @@ -11796,8 +12151,8 @@ ;; esac fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: case $host_cpu in @@ -11808,7 +12163,7 @@ *) hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -11819,8 +12174,8 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. @@ -11830,8 +12185,8 @@ if ${lt_cv_irix_exported_symbol+:} false; then : $as_echo_n "(cached) " >&6 else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } @@ -11843,24 +12198,34 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 $as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + if test yes = "$lt_cv_irix_exported_symbol"; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: inherit_rpath=yes link_all_deplibs=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + ld_shlibs=yes + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -11875,7 +12240,7 @@ newsos6) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: hardcode_shlibpath_var=no ;; @@ -11883,27 +12248,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes hardcode_shlibpath_var=no hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' fi else ld_shlibs=no @@ -11914,33 +12271,53 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes ;; osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -11951,24 +12328,24 @@ solaris*) no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -11978,11 +12355,11 @@ solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else whole_archive_flag_spec='-z allextract$convenience -z defaultextract' fi @@ -11992,10 +12369,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -12044,43 +12421,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' + no_undefined_flag='$wl-z,text' archive_cmds_need_lc=no hardcode_shlibpath_var=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' + no_undefined_flag='$wl-z,text' + allow_undefined_flag='$wl-z,nodefs' archive_cmds_need_lc=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_flag_spec='$wl-R,$libdir' hardcode_libdir_separator=':' link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' + export_dynamic_flag_spec='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -12095,10 +12472,10 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' + export_dynamic_flag_spec='$wl-Blargedynsym' ;; esac fi @@ -12106,7 +12483,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no +test no = "$ld_shlibs" && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -12132,7 +12509,7 @@ # Assume -lc should be added archive_cmds_need_lc=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $archive_cmds in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -12347,14 +12724,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -12370,28 +12747,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -12405,7 +12789,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([A-Za-z]:\),\1,g'` ;; + $SED 's|/\([A-Za-z]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -12414,7 +12798,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -12431,14 +12815,16 @@ # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[4-9]*) @@ -12446,41 +12832,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a(lib.so.V)' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -12490,18 +12926,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -12509,8 +12945,8 @@ bsdi[45]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -12522,7 +12958,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -12531,8 +12967,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -12548,17 +12984,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -12567,8 +13003,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -12595,7 +13031,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -12608,8 +13044,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -12622,7 +13058,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -12635,8 +13071,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -12649,8 +13085,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -12668,12 +13104,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -12698,26 +13135,15 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -12735,14 +13161,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -12750,8 +13177,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -12760,8 +13187,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -12774,8 +13201,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -12786,7 +13213,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -12794,8 +13221,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -12814,8 +13241,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -12824,13 +13251,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -12877,11 +13324,15 @@ # Add ABI-specific directories to the system library path. sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -12898,12 +13349,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -12913,7 +13364,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -12922,58 +13373,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -12984,8 +13445,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -12995,11 +13456,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -13007,8 +13468,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -13029,24 +13490,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -13064,7 +13525,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -13072,8 +13533,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -13083,20 +13544,35 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + + + + @@ -13193,15 +13669,15 @@ hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then + test yes = "$hardcode_automatic"; then # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && + if test no != "$hardcode_direct" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && + test no != "$hardcode_minus_L"; then # Linking always hardcodes the temporary library directory. hardcode_action=relink else @@ -13216,12 +13692,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then +if test relink = "$hardcode_action" || + test yes = "$inherit_rpath"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -13231,7 +13707,7 @@ - if test "x$enable_dlopen" != xyes; then + if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -13241,23 +13717,23 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } if ${ac_cv_lib_dl_dlopen+:} false; then : @@ -13295,10 +13771,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else - lt_cv_dlopen="dyld" + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes @@ -13306,10 +13782,18 @@ ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" + lt_cv_dlopen=shl_load else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } @@ -13348,11 +13832,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } @@ -13391,7 +13875,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } @@ -13430,7 +13914,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } @@ -13469,7 +13953,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi @@ -13490,21 +13974,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 @@ -13512,7 +13996,7 @@ if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -13559,9 +14043,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -13591,7 +14075,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -13611,14 +14095,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self_static=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -13665,9 +14149,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -13697,7 +14181,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -13718,9 +14202,9 @@ $as_echo "$lt_cv_dlopen_self_static" >&6; } fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -13764,7 +14248,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -13792,7 +14276,7 @@ - # Report which library types will actually be built + # Report what library types will actually be built { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 @@ -13800,13 +14284,13 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -13814,8 +14298,12 @@ ;; aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -13825,7 +14313,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } @@ -13839,11 +14327,11 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -CC="$lt_save_CC" +CC=$lt_save_CC - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then + if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -14022,7 +14510,7 @@ # the CXX compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then +if test yes != "$_lt_caught_CXX_error"; then # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" @@ -14083,46 +14571,39 @@ CFLAGS=$CXXFLAGS compiler=$CC compiler_CXX=$CC - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` + func_cc_basename $compiler +cc_basename=$func_cc_basename_result if test -n "$compiler"; then # We don't want -fno-exception when compiling C++ code, so set the # no_builtin_flag separately - if test "$GXX" = yes; then + if test yes = "$GXX"; then lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' else lt_prog_compiler_no_builtin_flag_CXX= fi - if test "$GXX" = yes; then + if test yes = "$GXX"; then # Set up default GNU C++ configuration # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -14136,7 +14617,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -14147,7 +14628,7 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -14158,32 +14639,32 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -14219,22 +14700,22 @@ # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + if test yes = "$with_gnu_ld"; then + archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' # If archive_cmds runs LD, not CC, wlarc should be empty # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to # investigate it a little bit more. (MM) - wlarc='${wl}' + wlarc='$wl' # ancient GNU ld didn't support --whole-archive et. al. if eval "`$CC -print-prog-name=ld` --help 2>&1" | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else whole_archive_flag_spec_CXX= fi @@ -14271,18 +14752,30 @@ ld_shlibs_CXX=no ;; aix[4-9]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do case $ld_flag in @@ -14292,6 +14785,13 @@ ;; esac done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -14310,13 +14810,21 @@ hardcode_direct_absolute_CXX=yes hardcode_libdir_separator_CXX=':' link_all_deplibs_CXX=yes - file_list_spec_CXX='${wl}-f,' + file_list_spec_CXX='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct_CXX=no + hardcode_direct_absolute_CXX=no + ;; + esac - if test "$GXX" = yes; then + if test yes = "$GXX"; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -14334,36 +14842,44 @@ fi esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec_CXX='${wl}-bexpall' + export_dynamic_flag_spec_CXX='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. always_export_symbols_CXX=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - allow_undefined_flag_CXX='-berok' + # The "-G" linker flag allows undefined symbols. + no_undefined_flag_CXX='-bernotok' # Determine the default libpath from the value encoded in an empty # executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath__CXX+:} false; then : @@ -14398,7 +14914,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX="/usr/lib:/lib" + lt_cv_aix_libpath__CXX=/usr/lib:/lib fi fi @@ -14406,18 +14922,18 @@ aix_libpath=$lt_cv_aix_libpath__CXX fi - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib' allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath__CXX+:} false; then : @@ -14452,7 +14968,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX="/usr/lib:/lib" + lt_cv_aix_libpath__CXX=/usr/lib:/lib fi fi @@ -14460,22 +14976,34 @@ aix_libpath=$lt_cv_aix_libpath__CXX fi - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag_CXX=' ${wl}-bernotok' - allow_undefined_flag_CXX=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + no_undefined_flag_CXX=' $wl-bernotok' + allow_undefined_flag_CXX=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec_CXX='$convenience' fi archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -14485,7 +15013,7 @@ allow_undefined_flag_CXX=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else ld_shlibs_CXX=no fi @@ -14513,57 +15041,58 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' enable_shared_with_static_runtimes_CXX=yes # Don't use ranlib old_postinstall_cmds_CXX='chmod 644 $oldlib' postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # g++ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec_CXX='-L$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' + export_dynamic_flag_spec_CXX='$wl--export-all-symbols' allow_undefined_flag_CXX=unsupported always_export_symbols_CXX=no enable_shared_with_static_runtimes_CXX=yes if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs_CXX=no fi @@ -14577,27 +15106,27 @@ hardcode_direct_CXX=no hardcode_automatic_CXX=yes hardcode_shlibpath_var_CXX=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else whole_archive_flag_spec_CXX='' fi link_all_deplibs_CXX=yes - allow_undefined_flag_CXX="$_lt_dar_allow_undefined" + allow_undefined_flag_CXX=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + if test yes != "$lt_cv_apple_cc_single_mod"; then + archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi else @@ -14606,6 +15135,34 @@ ;; + os2*) + hardcode_libdir_flag_spec_CXX='-L$libdir' + hardcode_minus_L_CXX=yes + allow_undefined_flag_CXX=unsupported + shrext_cmds=.dll + archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes_CXX=yes + ;; + dgux*) case $cc_basename in ec++*) @@ -14640,18 +15197,15 @@ ld_shlibs_CXX=yes ;; - gnu*) - ;; - haiku*) - archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' link_all_deplibs_CXX=yes ;; hpux9*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir' hardcode_libdir_separator_CXX=: - export_dynamic_flag_spec_CXX='${wl}-E' + export_dynamic_flag_spec_CXX='$wl-E' hardcode_direct_CXX=yes hardcode_minus_L_CXX=yes # Not in the search PATH, # but as the default @@ -14663,7 +15217,7 @@ ld_shlibs_CXX=no ;; aCC*) - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -14672,11 +15226,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GXX"; then + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -14686,15 +15240,15 @@ ;; hpux10*|hpux11*) - if test $with_gnu_ld = no; then - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir' hardcode_libdir_separator_CXX=: case $host_cpu in hppa*64*|ia64*) ;; *) - export_dynamic_flag_spec_CXX='${wl}-E' + export_dynamic_flag_spec_CXX='$wl-E' ;; esac fi @@ -14720,13 +15274,13 @@ aCC*) case $host_cpu in hppa*64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -14737,20 +15291,20 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then case $host_cpu in hppa*64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -14765,22 +15319,22 @@ interix[3-9]*) hardcode_direct_CXX=no hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}-E' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' + export_dynamic_flag_spec_CXX='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in CC*) # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -14789,22 +15343,22 @@ old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' ;; *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' fi fi link_all_deplibs_CXX=yes ;; esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' hardcode_libdir_separator_CXX=: inherit_rpath_CXX=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -14812,8 +15366,8 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -14822,10 +15376,10 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' # Archives containing C++ object files must be created using # "CC -Bstatic", where "CC" is the KAI C++ compiler. @@ -14839,59 +15393,59 @@ # earlier do not add the objects themselves. case `$CC -V 2>&1` in *"Version 7."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= case $host_cpu in ia64*) tmp_idyn=' -i_dynamic';; esac - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac archive_cmds_need_lc_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' + whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive' ;; pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in *pgCC\ [1-5].* | *pgcpp\ [1-5].*) prelink_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' old_archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 6 and above use weak symbols - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + hardcode_libdir_flag_spec_CXX='$wl--rpath $wl$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' + whole_archive_flag_spec_CXX='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' ;; cxx*) # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH hardcode_libdir_flag_spec_CXX='-rpath $libdir' @@ -14905,18 +15459,18 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' + archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) @@ -14924,10 +15478,10 @@ *Sun\ C*) # Sun C++ 5.9 no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object_CXX=yes # Not sure whether something based on @@ -14985,22 +15539,17 @@ ld_shlibs_CXX=yes ;; - openbsd2*) - # C++ shared libraries are fairly broken - ld_shlibs_CXX=no - ;; - - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then hardcode_direct_CXX=yes hardcode_shlibpath_var_CXX=no hardcode_direct_absolute_CXX=yes archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + export_dynamic_flag_spec_CXX='$wl-E' + whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' fi output_verbose_link_cmd=func_echo_all else @@ -15016,9 +15565,9 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' hardcode_libdir_separator_CXX=: # Archives containing C++ object files must be created using @@ -15036,17 +15585,17 @@ cxx*) case $host in osf3*) - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*' + archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' ;; *) allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.exp' hardcode_libdir_flag_spec_CXX='-rpath $libdir' ;; esac @@ -15061,21 +15610,21 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + if test yes,no = "$GXX,$with_gnu_ld"; then + allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*' case $host in osf3*) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; *) - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' hardcode_libdir_separator_CXX=: # Commands to make compiler produce verbose output that lists @@ -15121,9 +15670,9 @@ # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' hardcode_libdir_flag_spec_CXX='-R$libdir' hardcode_shlibpath_var_CXX=no @@ -15131,7 +15680,7 @@ solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. + # but understands '-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' ;; @@ -15148,30 +15697,30 @@ ;; gcx*) # Green Hills C++ Compiler - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; *) # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' + if test yes,no = "$GXX,$with_gnu_ld"; then + no_undefined_flag_CXX=' $wl-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else - # g++ 2.7 appears to require `-G' NOT `-shared' on this + # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -15179,11 +15728,11 @@ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' + hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir' case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' ;; esac fi @@ -15192,52 +15741,52 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_CXX='${wl}-z,text' + no_undefined_flag_CXX='$wl-z,text' archive_cmds_need_lc_CXX=no hardcode_shlibpath_var_CXX=no runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag_CXX='${wl}-z,text' - allow_undefined_flag_CXX='${wl}-z,nodefs' + no_undefined_flag_CXX='$wl-z,text' + allow_undefined_flag_CXX='$wl-z,nodefs' archive_cmds_need_lc_CXX=no hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' + hardcode_libdir_flag_spec_CXX='$wl-R,$libdir' hardcode_libdir_separator_CXX=':' link_all_deplibs_CXX=yes - export_dynamic_flag_spec_CXX='${wl}-Bexport' + export_dynamic_flag_spec_CXX='$wl-Bexport' runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ - '"$old_archive_cmds_CXX" + '"$old_archive_cmds_CXX" reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ - '"$reload_cmds_CXX" + '"$reload_cmds_CXX" ;; *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; @@ -15269,10 +15818,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } - test "$ld_shlibs_CXX" = no && can_build_shared=no + test no = "$ld_shlibs_CXX" && can_build_shared=no - GCC_CXX="$GXX" - LD_CXX="$LD" + GCC_CXX=$GXX + LD_CXX=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -15316,13 +15865,13 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + case $prev$p in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. # Remove the space. - if test $p = "-L" || - test $p = "-R"; then + if test x-L = "$p" || + test x-R = "$p"; then prev=$p continue fi @@ -15338,16 +15887,16 @@ case $p in =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in + if test no = "$pre_test_object_deps_done"; then + case $prev in -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. if test -z "$compiler_lib_search_path_CXX"; then - compiler_lib_search_path_CXX="${prev}${p}" + compiler_lib_search_path_CXX=$prev$p else - compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" + compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p" fi ;; # The "-l" case would never come before the object being @@ -15355,9 +15904,9 @@ esac else if test -z "$postdeps_CXX"; then - postdeps_CXX="${prev}${p}" + postdeps_CXX=$prev$p else - postdeps_CXX="${postdeps_CXX} ${prev}${p}" + postdeps_CXX="${postdeps_CXX} $prev$p" fi fi prev= @@ -15372,15 +15921,15 @@ continue fi - if test "$pre_test_object_deps_done" = no; then + if test no = "$pre_test_object_deps_done"; then if test -z "$predep_objects_CXX"; then - predep_objects_CXX="$p" + predep_objects_CXX=$p else predep_objects_CXX="$predep_objects_CXX $p" fi else if test -z "$postdep_objects_CXX"; then - postdep_objects_CXX="$p" + postdep_objects_CXX=$p else postdep_objects_CXX="$postdep_objects_CXX $p" fi @@ -15410,51 +15959,6 @@ postdep_objects_CXX= postdeps_CXX= ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; esac @@ -15463,7 +15967,7 @@ esac compiler_lib_search_dirs_CXX= if test -n "${compiler_lib_search_path_CXX}"; then - compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` + compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'` fi @@ -15502,17 +16006,18 @@ # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then + if test yes = "$GXX"; then lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_static_CXX='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static_CXX='-Bstatic' fi + lt_prog_compiler_pic_CXX='-fPIC' ;; amigaos*) @@ -15523,8 +16028,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -15539,6 +16044,11 @@ # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static_CXX='$wl-static' + ;; + esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -15588,7 +16098,7 @@ case $host_os in aix[4-9]*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static_CXX='-Bstatic' else @@ -15628,14 +16138,14 @@ case $cc_basename in CC*) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then + lt_prog_compiler_static_CXX='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then lt_prog_compiler_pic_CXX='+Z' fi ;; aCC*) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + lt_prog_compiler_static_CXX='$wl-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -15664,7 +16174,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -15672,7 +16182,7 @@ lt_prog_compiler_pic_CXX='-fPIC' ;; ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. + # old Intel C++ for x86_64, which still supported -KPIC. lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-static' @@ -15817,7 +16327,7 @@ fi case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic_CXX= ;; @@ -15849,7 +16359,7 @@ lt_cv_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -15879,7 +16389,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } -if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then +if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then case $lt_prog_compiler_pic_CXX in "" | " "*) ;; *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; @@ -15905,7 +16415,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -15924,13 +16434,13 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } -if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then +if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then : else lt_prog_compiler_static_CXX= @@ -16044,8 +16554,8 @@ -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -16057,9 +16567,9 @@ ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -16076,17 +16586,21 @@ case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" + export_symbols_cmds_CXX=$ltdll_cmds ;; cygwin* | mingw* | cegcc*) case $cc_basename in @@ -16106,7 +16620,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } -test "$ld_shlibs_CXX" = no && can_build_shared=no +test no = "$ld_shlibs_CXX" && can_build_shared=no with_gnu_ld_CXX=$with_gnu_ld @@ -16123,7 +16637,7 @@ # Assume -lc should be added archive_cmds_need_lc_CXX=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $archive_cmds_CXX in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -16251,7 +16765,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -16268,14 +16782,16 @@ # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[4-9]*) @@ -16283,41 +16799,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a(lib.so.V)' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -16327,18 +16893,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -16346,8 +16912,8 @@ bsdi[45]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -16359,7 +16925,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -16368,8 +16934,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -16385,16 +16951,16 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -16403,8 +16969,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -16431,7 +16997,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -16444,8 +17010,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -16458,7 +17024,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -16471,8 +17037,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -16484,8 +17050,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -16503,12 +17069,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -16533,26 +17100,15 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -16570,14 +17126,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -16585,8 +17142,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -16595,8 +17152,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -16609,8 +17166,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -16621,7 +17178,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -16629,8 +17186,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -16649,8 +17206,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -16659,13 +17216,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec_CXX='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -16712,11 +17289,15 @@ # Add ABI-specific directories to the system library path. sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -16733,12 +17314,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -16748,7 +17329,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -16757,58 +17338,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -16819,8 +17410,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -16830,11 +17421,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -16842,8 +17433,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -16864,24 +17455,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -16899,7 +17490,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -16907,8 +17498,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -16918,20 +17509,32 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + @@ -16974,15 +17577,15 @@ hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || test -n "$runpath_var_CXX" || - test "X$hardcode_automatic_CXX" = "Xyes" ; then + test yes = "$hardcode_automatic_CXX"; then # We can hardcode non-existent directories. - if test "$hardcode_direct_CXX" != no && + if test no != "$hardcode_direct_CXX" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" && + test no != "$hardcode_minus_L_CXX"; then # Linking always hardcodes the temporary library directory. hardcode_action_CXX=relink else @@ -16997,12 +17600,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 $as_echo "$hardcode_action_CXX" >&6; } -if test "$hardcode_action_CXX" = relink || - test "$inherit_rpath_CXX" = yes; then +if test relink = "$hardcode_action_CXX" || + test yes = "$inherit_rpath_CXX"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -17025,7 +17628,7 @@ lt_cv_path_LD=$lt_save_path_LD lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes +fi # test yes != "$_lt_caught_CXX_error" ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -17447,7 +18050,7 @@ } >&5 lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, +'$as_me' creates a local libtool stub from the current configuration, for use in further configure time tests before the real libtool is generated. @@ -17461,14 +18064,14 @@ Report bugs to ." lt_cl_version="\ -cogl config.lt 1.22.0 +cogl config.lt 1.22.2 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." -while test $# != 0 +while test 0 != $# do case $1 in --version | --v* | -V ) @@ -17481,10 +18084,10 @@ lt_cl_silent=: ;; -*) as_fn_error $? "unrecognized option: $1 -Try \`$0 --help' for more information." "$LINENO" 5 ;; +Try '$0 --help' for more information." "$LINENO" 5 ;; *) as_fn_error $? "unrecognized argument: $1 -Try \`$0 --help' for more information." "$LINENO" 5 ;; +Try '$0 --help' for more information." "$LINENO" 5 ;; esac shift done @@ -17510,6 +18113,7 @@ enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' @@ -17559,10 +18163,13 @@ GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`' objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' @@ -17627,7 +18234,8 @@ finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' +configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`' hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' @@ -17732,9 +18340,12 @@ compiler \ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_import \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +lt_cv_nm_interface \ nm_file_list_spec \ +lt_cv_truncate_bin \ lt_prog_compiler_no_builtin_flag \ lt_prog_compiler_pic \ lt_prog_compiler_wl \ @@ -17800,7 +18411,7 @@ compiler_lib_search_path_CXX; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -17827,7 +18438,8 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec \ +configure_time_dlsearch_path \ +configure_time_lt_sys_library_path \ reload_cmds_CXX \ old_archive_cmds_CXX \ old_archive_from_new_cmds_CXX \ @@ -17841,7 +18453,7 @@ postlink_cmds_CXX; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -17850,19 +18462,16 @@ done ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile' @@ -17877,55 +18486,53 @@ $as_echo "$as_me: creating $ofile" >&6;} - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . # The names of the tagged configurations supported by this script. -available_tags="CXX " +available_tags='CXX ' + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} # ### BEGIN LIBTOOL CONFIG @@ -17945,6 +18552,9 @@ # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shared archive member basename,for filename based shared library versioning on AIX. +shared_archive_member_spec=$shared_archive_member_spec + # Shell to use when invoking shell scripts. SHELL=$lt_SHELL @@ -18062,18 +18672,27 @@ # Transform the output of nm in a proper C declaration. global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +# Transform the output of nm into a list of symbols to manually relocate. +global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import + # Transform the output of nm in a C name address pair. global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# The name lister interface. +nm_interface=$lt_lt_cv_nm_interface + # Specify filename containing input files for \$NM. nm_file_list_spec=$lt_nm_file_list_spec -# The root where to search for dependent libraries,and in which our libraries should be installed. +# The root where to search for dependent libraries,and where our libraries should be installed. lt_sysroot=$lt_sysroot +# Command to truncate a binary pipe. +lt_truncate_bin=$lt_lt_cv_truncate_bin + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -18164,8 +18783,11 @@ # Compile-time system search path for libraries. sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +# Detected run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path + +# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. +configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path # Whether dlopen is supported. dlopen_support=$enable_dlopen @@ -18258,13 +18880,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute @@ -18330,13 +18952,72 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -18345,7 +19026,7 @@ esac -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # We use sed instead of cat because bash on DJGPP gets confused if @@ -18355,165 +19036,6 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -18600,13 +19122,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct_CXX -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute_CXX @@ -18681,7 +19203,7 @@ # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. lt_cl_success=: -test "$silent" = yes && +test yes = "$silent" && lt_config_lt_args="$lt_config_lt_args --quiet" exec 5>/dev/null $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false @@ -18732,7 +19254,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5 $as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; } if test "x$ac_cv_lib_mw__mwvalidcheckl" = xyes; then : - LIBM="-lmw" + LIBM=-lmw fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 @@ -18814,7 +19336,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 $as_echo "$ac_cv_lib_m_cos" >&6; } if test "x$ac_cv_lib_m_cos" = xyes; then : - LIBM="-lm" + LIBM=-lm fi ;; @@ -25412,13 +25934,6 @@ -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } # Check whether --enable-nls was given. @@ -25434,7 +25949,7 @@ - GETTEXT_MACRO_VERSION=0.17 + GETTEXT_MACRO_VERSION=0.19 @@ -25442,15 +25957,14 @@ # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi # Find out how to test for executable files. Don't use a zero-byte file, @@ -25565,15 +26079,14 @@ # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi # Find out how to test for executable files. Don't use a zero-byte file, @@ -25643,15 +26156,14 @@ # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi # Find out how to test for executable files. Don't use a zero-byte file, @@ -25735,6 +26247,7 @@ prefix="$acl_save_prefix" + # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes @@ -25745,21 +26258,21 @@ # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5 -$as_echo_n "checking for ld used by GCC... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -25769,12 +26282,12 @@ esac case $ac_prog in # Accept absolute paths. - [\\/]* | [A-Za-z]:[\\/]*) + [\\/]* | ?:[\\/]*) re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + # Canonicalize the pathname of ld + ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` + while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; @@ -25798,23 +26311,26 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do + IFS="$acl_save_ifs" test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then acl_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + case `"$acl_cv_path_LD" -v 2>&1 &6 else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. + # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &5 @@ -25882,23 +26400,70 @@ - acl_libdirstem=lib - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; + + acl_libdirstem=lib + acl_libdirstem2= + case "$host_os" in + solaris*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 +$as_echo_n "checking for 64-bit host... " >&6; } +if ${gl_cv_solaris_64bit+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef _LP64 +sixtyfour bits +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "sixtyfour bits" >/dev/null 2>&1; then : + gl_cv_solaris_64bit=yes +else + gl_cv_solaris_64bit=no +fi +rm -f conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5 +$as_echo "$gl_cv_solaris_64bit" >&6; } + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; esac fi - done - IFS="$acl_save_IFS" - fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" + + + @@ -25944,6 +26509,10 @@ else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi @@ -25953,6 +26522,7 @@ LTLIBICONV= INCICONV= LIBICONV_PREFIX= + HAVE_LIBICONV= rpathdirs= ltrpathdirs= names_already_handled= @@ -25970,7 +26540,7 @@ done if test -z "$already_handled"; then names_already_handled="$names_already_handled $name" - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` eval value=\"\$HAVE_LIB$uppername\" if test -n "$value"; then if test "$value" = yes; then @@ -26095,7 +26665,9 @@ if test "X$found_dir" != "X"; then LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" else haveit= @@ -26162,7 +26734,16 @@ case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - LIBICONV_PREFIX="$basedir" + if test "$name" = 'iconv'; then + LIBICONV_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = 'iconv'; then + LIBICONV_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac @@ -26211,9 +26792,11 @@ case "$dep" in -L*) additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -26363,6 +26946,12 @@ + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : @@ -26480,15 +27069,19 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include $gt_revision_test_code extern int _nl_msg_cat_cntr; extern int *_nl_domain_bindings; + int main () { + bindtextdomain ("", ""); return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings + ; return 0; } @@ -26546,14 +27139,16 @@ am_cv_lib_iconv=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include #include + int main () { iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); ; return 0; } @@ -26568,14 +27163,16 @@ LIBS="$LIBS $LIBICONV" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include #include + int main () { iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); ; return 0; } @@ -26599,15 +27196,17 @@ $as_echo_n "(cached) " >&6 else - am_save_LIBS="$LIBS" + am_save_LIBS="$LIBS" if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi if test "$cross_compiling" = yes; then : - case "$host_os" in + + case "$host_os" in aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; *) am_cv_func_iconv_works="guessing yes" ;; esac + else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -26616,6 +27215,7 @@ #include int main () { + int result = 0; /* Test against AIX 5.1 bug: Failures are not distinguishable from successful returns. */ { @@ -26632,7 +27232,47 @@ (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) - return 1; + result |= 1; + iconv_close (cd_utf8_to_88591); + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\263"; + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 2; + iconv_close (cd_ascii_to_88591); + } + } + /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static const char input[] = "\304"; + static char buf[2] = { (char)0xDE, (char)0xAD }; + const char *inptr = input; + size_t inbytesleft = 1; + char *outptr = buf; + size_t outbytesleft = 1; + size_t res = iconv (cd_88591_to_utf8, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) + result |= 4; + iconv_close (cd_88591_to_utf8); } } #if 0 /* This bug could be worked around by the caller. */ @@ -26651,7 +27291,8 @@ (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if ((int)res > 0) - return 1; + result |= 8; + iconv_close (cd_88591_to_utf8); } } #endif @@ -26665,8 +27306,8 @@ && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) /* Try HP-UX names. */ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) - return 1; - return 0; + result |= 16; + return result; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : @@ -26713,6 +27354,9 @@ + + + use_additional=yes acl_save_prefix="$prefix" @@ -26749,6 +27393,10 @@ else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi @@ -26758,6 +27406,7 @@ LTLIBINTL= INCINTL= LIBINTL_PREFIX= + HAVE_LIBINTL= rpathdirs= ltrpathdirs= names_already_handled= @@ -26775,7 +27424,7 @@ done if test -z "$already_handled"; then names_already_handled="$names_already_handled $name" - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` eval value=\"\$HAVE_LIB$uppername\" if test -n "$value"; then if test "$value" = yes; then @@ -26900,7 +27549,9 @@ if test "X$found_dir" != "X"; then LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name" if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else haveit= @@ -26967,7 +27618,16 @@ case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - LIBINTL_PREFIX="$basedir" + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac @@ -27016,9 +27676,11 @@ case "$dep" in -L*) additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -27144,6 +27806,11 @@ done fi + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 $as_echo_n "checking for GNU gettext in libintl... " >&6; } if eval \${$gt_func_gnugettext_libintl+:} false; then : @@ -27155,6 +27822,7 @@ LIBS="$LIBS $LIBINTL" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include $gt_revision_test_code extern int _nl_msg_cat_cntr; @@ -27163,11 +27831,14 @@ "C" #endif const char *_nl_expand_alias (const char *); + int main () { + bindtextdomain ("", ""); return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") + ; return 0; } @@ -27183,6 +27854,7 @@ LIBS="$LIBS $LIBICONV" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include $gt_revision_test_code extern int _nl_msg_cat_cntr; @@ -27191,19 +27863,22 @@ "C" #endif const char *_nl_expand_alias (const char *); + int main () { + bindtextdomain ("", ""); return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") + ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" - eval "$gt_func_gnugettext_libintl=yes" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + eval "$gt_func_gnugettext_libintl=yes" fi rm -f core conftest.err conftest.$ac_objext \ @@ -29073,7 +29748,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by cogl $as_me 1.22.0, which was +This file was extended by cogl $as_me 1.22.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -29139,7 +29814,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -cogl config.status 1.22.0 +cogl config.status 1.22.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -29274,6 +29949,7 @@ enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' @@ -29323,10 +29999,13 @@ GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`' objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' @@ -29391,7 +30070,8 @@ finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' +configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`' hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' @@ -29496,9 +30176,12 @@ compiler \ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_import \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +lt_cv_nm_interface \ nm_file_list_spec \ +lt_cv_truncate_bin \ lt_prog_compiler_no_builtin_flag \ lt_prog_compiler_pic \ lt_prog_compiler_wl \ @@ -29564,7 +30247,7 @@ compiler_lib_search_path_CXX; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -29591,7 +30274,8 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec \ +configure_time_dlsearch_path \ +configure_time_lt_sys_library_path \ reload_cmds_CXX \ old_archive_cmds_CXX \ old_archive_from_new_cmds_CXX \ @@ -29605,7 +30289,7 @@ postlink_cmds_CXX; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -29614,19 +30298,16 @@ done ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile' @@ -30734,55 +31415,53 @@ ;; "libtool":C) - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . # The names of the tagged configurations supported by this script. -available_tags="CXX " +available_tags='CXX ' + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} # ### BEGIN LIBTOOL CONFIG @@ -30802,6 +31481,9 @@ # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shared archive member basename,for filename based shared library versioning on AIX. +shared_archive_member_spec=$shared_archive_member_spec + # Shell to use when invoking shell scripts. SHELL=$lt_SHELL @@ -30919,18 +31601,27 @@ # Transform the output of nm in a proper C declaration. global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +# Transform the output of nm into a list of symbols to manually relocate. +global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import + # Transform the output of nm in a C name address pair. global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# The name lister interface. +nm_interface=$lt_lt_cv_nm_interface + # Specify filename containing input files for \$NM. nm_file_list_spec=$lt_nm_file_list_spec -# The root where to search for dependent libraries,and in which our libraries should be installed. +# The root where to search for dependent libraries,and where our libraries should be installed. lt_sysroot=$lt_sysroot +# Command to truncate a binary pipe. +lt_truncate_bin=$lt_lt_cv_truncate_bin + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -31021,8 +31712,11 @@ # Compile-time system search path for libraries. sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +# Detected run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path + +# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. +configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path # Whether dlopen is supported. dlopen_support=$enable_dlopen @@ -31115,13 +31809,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute @@ -31187,13 +31881,72 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -31202,7 +31955,7 @@ esac -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # We use sed instead of cat because bash on DJGPP gets confused if @@ -31212,165 +31965,6 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -31457,13 +32051,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct_CXX -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute_CXX @@ -31899,7 +32493,7 @@ case "$ac_file" in */Makefile.in) # Adjust a relative srcdir. ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` # In autoconf-2.13 it is called $ac_given_srcdir. # In autoconf-2.50 it is called $srcdir. @@ -31915,7 +32509,8 @@ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then rm -f "$ac_dir/POTFILES" test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + gt_tab=`printf '\t'` + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" POMAKEFILEDEPS="POTFILES.in" # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend # on $ac_dir but don't depend on user-specified configuration @@ -31926,12 +32521,12 @@ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" else # The set of available languages was given in configure.in. - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi # Compute POFILES diff -Nru cogl-1.22.0/configure.ac cogl-1.22.2/configure.ac --- cogl-1.22.0/configure.ac 2015-09-16 13:55:52.000000000 +0000 +++ cogl-1.22.2/configure.ac 2016-08-26 17:33:29.000000000 +0000 @@ -25,7 +25,7 @@ dnl Since the core Cogl library has to also maintain support for the dnl Cogl 1.x API for Clutter then we track the 1.x version separately. m4_define([cogl_1_minor_version], [22]) -m4_define([cogl_1_micro_version], [0]) +m4_define([cogl_1_micro_version], [2]) m4_define([cogl_1_version], [1.cogl_1_minor_version.cogl_1_micro_version]) dnl ================================================================ @@ -56,7 +56,7 @@ # 5. If any interfaces have been removed since the last public release, # then set AGE to 0. m4_define([cogl_lt_current], 24) -m4_define([cogl_lt_revision], 1) +m4_define([cogl_lt_revision], 2) m4_define([cogl_lt_age], 4) # We do also tell libtool the pretty version: m4_define([cogl_lt_release], [cogl_version]) @@ -1278,7 +1278,7 @@ dnl ================================================================ dnl I18n stuff. dnl ================================================================ -AM_GNU_GETTEXT_VERSION([0.17]) +AM_GNU_GETTEXT_VERSION([0.19]) AM_GNU_GETTEXT([external]) GETTEXT_PACKAGE="cogl" diff -Nru cogl-1.22.0/debian/changelog cogl-1.22.2/debian/changelog --- cogl-1.22.0/debian/changelog 2016-01-09 23:20:19.000000000 +0000 +++ cogl-1.22.2/debian/changelog 2016-08-30 10:40:22.000000000 +0000 @@ -1,3 +1,28 @@ +cogl (1.22.2-2) unstable; urgency=medium + + * Disable test suite as the tests need a working GL/GLES environment which + doesn't exist on the buildds. + + -- Michael Biebl Tue, 30 Aug 2016 12:40:22 +0200 + +cogl (1.22.2-1) unstable; urgency=medium + + [ Jeremy Bicha ] + * Have libcogl-dev depend on libcairo2-dev + + [ Michael Biebl ] + * New upstream release. + * Drop 0001-kms-winsys-don-t-wait-for-a-flip-when-page-flipping-.patch, + merged upstream. + * Convert from cdbs to dh. + * Drop dbg packages now that we have automatic dbgsym packages. + Ensure proper upgrade to the new dbgsym packages by using + dh_strip --dbgsym-migration. Bump the Build-Depends on debhelper + accordingly. + * Bump Standards-Version to 3.9.8. + + -- Michael Biebl Tue, 30 Aug 2016 00:57:01 +0200 + cogl (1.22.0-2) unstable; urgency=medium * Fix black screen after logout. Patch cherry-picked from upstream Git. diff -Nru cogl-1.22.0/debian/control cogl-1.22.2/debian/control --- cogl-1.22.0/debian/control 2016-01-09 23:20:54.000000000 +0000 +++ cogl-1.22.2/debian/control 2016-08-30 10:40:22.000000000 +0000 @@ -7,8 +7,7 @@ Priority: optional Maintainer: Debian GNOME Maintainers Uploaders: Andreas Henriksson , Emilio Pozuelo Monfort , Michael Biebl , Sjoerd Simons , Rico Tzschichholz -Build-Depends: debhelper (>= 9), - cdbs (>= 0.4.93~), +Build-Depends: debhelper (>= 9.20160114~), dh-autoreconf, gnome-pkg-tools, gtk-doc-tools (>= 1.13), @@ -27,7 +26,7 @@ gobject-introspection (>= 1.33.4-1~), libgirepository1.0-dev (>= 0.9.12), libgstreamer-plugins-base1.0-dev -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/cogl Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/cogl/ @@ -70,6 +69,7 @@ Architecture: any Depends: libcogl20 (= ${binary:Version}), gir1.2-cogl-1.0 (= ${binary:Version}), + libcairo2-dev, libgl1-mesa-dev (>= 7.1~rc3-1~), libgles2-mesa-dev (>= 7.1~rc3-1~) | libgles2-dev, libglib2.0-dev (>= 2.28.0), @@ -94,21 +94,6 @@ . This package contains the development files for libcogl. -Package: libcogl20-dbg -Section: debug -Priority: extra -Architecture: any -Depends: libcogl20 (= ${binary:Version}), - ${misc:Depends} -Multi-Arch: same -Description: Object oriented GL/GLES Abstraction/Utility Layer (debug files) - Cogl is a small open source library for using 3D graphics hardware to draw - pretty pictures. The API departs from the flat state machine style of - OpenGL and is designed to make it easy to write orthogonal components that - can render without stepping on each others toes. - . - This package contains the debug files for libcogl. - Package: libcogl-doc Section: doc Architecture: all @@ -207,21 +192,6 @@ . This package contains the development files for libcogl-pango. -Package: libcogl-pango20-dbg -Section: debug -Priority: extra -Architecture: any -Depends: libcogl-pango20 (= ${binary:Version}), - ${misc:Depends} -Multi-Arch: same -Description: Object oriented GL/GLES Abstraction/Utility Layer (debug files) - Cogl is a small open source library for using 3D graphics hardware to draw - pretty pictures. The API departs from the flat state machine style of - OpenGL and is designed to make it easy to write orthogonal components that - can render without stepping on each others toes. - . - This package contains the debug files for libcogl-pango. - Package: gir1.2-coglpango-1.0 Section: introspection Architecture: any @@ -319,21 +289,6 @@ . This package contains the development files for libcogl-gst. -Package: libcogl-gst20-dbg -Section: debug -Priority: extra -Architecture: any -Depends: libcogl-gst20 (= ${binary:Version}), - ${misc:Depends} -Multi-Arch: same -Description: Object oriented GL/GLES Abstraction/Utility Layer (debug files) - Cogl is a small open source library for using 3D graphics hardware to draw - pretty pictures. The API departs from the flat state machine style of - OpenGL and is designed to make it easy to write orthogonal components that - can render without stepping on each others toes. - . - This package contains the debug files for libcogl-gst. - Package: gir1.2-coglgst-2.0 Section: introspection Architecture: any diff -Nru cogl-1.22.0/debian/control.in cogl-1.22.2/debian/control.in --- cogl-1.22.0/debian/control.in 2016-01-09 23:14:57.000000000 +0000 +++ cogl-1.22.2/debian/control.in 2016-08-29 22:55:58.000000000 +0000 @@ -3,8 +3,7 @@ Priority: optional Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@, Rico Tzschichholz -Build-Depends: debhelper (>= 9), - cdbs (>= 0.4.93~), +Build-Depends: debhelper (>= 9.20160114~), dh-autoreconf, gnome-pkg-tools, gtk-doc-tools (>= 1.13), @@ -23,7 +22,7 @@ gobject-introspection (>= 1.33.4-1~), libgirepository1.0-dev (>= 0.9.12), libgstreamer-plugins-base1.0-dev -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/cogl Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/cogl/ @@ -66,6 +65,7 @@ Architecture: any Depends: libcogl20 (= ${binary:Version}), gir1.2-cogl-1.0 (= ${binary:Version}), + libcairo2-dev, libgl1-mesa-dev (>= 7.1~rc3-1~), libgles2-mesa-dev (>= 7.1~rc3-1~) | libgles2-dev, libglib2.0-dev (>= 2.28.0), @@ -90,21 +90,6 @@ . This package contains the development files for libcogl. -Package: libcogl20-dbg -Section: debug -Priority: extra -Architecture: any -Depends: libcogl20 (= ${binary:Version}), - ${misc:Depends} -Multi-Arch: same -Description: Object oriented GL/GLES Abstraction/Utility Layer (debug files) - Cogl is a small open source library for using 3D graphics hardware to draw - pretty pictures. The API departs from the flat state machine style of - OpenGL and is designed to make it easy to write orthogonal components that - can render without stepping on each others toes. - . - This package contains the debug files for libcogl. - Package: libcogl-doc Section: doc Architecture: all @@ -203,21 +188,6 @@ . This package contains the development files for libcogl-pango. -Package: libcogl-pango20-dbg -Section: debug -Priority: extra -Architecture: any -Depends: libcogl-pango20 (= ${binary:Version}), - ${misc:Depends} -Multi-Arch: same -Description: Object oriented GL/GLES Abstraction/Utility Layer (debug files) - Cogl is a small open source library for using 3D graphics hardware to draw - pretty pictures. The API departs from the flat state machine style of - OpenGL and is designed to make it easy to write orthogonal components that - can render without stepping on each others toes. - . - This package contains the debug files for libcogl-pango. - Package: gir1.2-coglpango-1.0 Section: introspection Architecture: any @@ -315,21 +285,6 @@ . This package contains the development files for libcogl-gst. -Package: libcogl-gst20-dbg -Section: debug -Priority: extra -Architecture: any -Depends: libcogl-gst20 (= ${binary:Version}), - ${misc:Depends} -Multi-Arch: same -Description: Object oriented GL/GLES Abstraction/Utility Layer (debug files) - Cogl is a small open source library for using 3D graphics hardware to draw - pretty pictures. The API departs from the flat state machine style of - OpenGL and is designed to make it easy to write orthogonal components that - can render without stepping on each others toes. - . - This package contains the debug files for libcogl-gst. - Package: gir1.2-coglgst-2.0 Section: introspection Architecture: any diff -Nru cogl-1.22.0/debian/copyright cogl-1.22.2/debian/copyright --- cogl-1.22.0/debian/copyright 2016-01-09 23:14:50.000000000 +0000 +++ cogl-1.22.2/debian/copyright 2016-06-04 17:53:30.000000000 +0000 @@ -1,6 +1,6 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Cogl -Source: http://git.gnome.org/browse/cogl +Source: https://download.gnome.org/sources/cogl/ Files: * Copyright: 2007,2008 OpenedHand @@ -10,23 +10,6 @@ 2011,2012 Collabora Ltd. 2008-2011 Kristian Høgsberg License: MIT - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - . - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. Files: cogl/cogl-point-in-poly.c Copyright: 1970-2003, Wm. Randolph Franklin @@ -127,6 +110,8 @@ Files: debian/patches/* Copyright: 2014, Andreas Henriksson License: MIT + +License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights diff -Nru cogl-1.22.0/debian/libcogl20.docs cogl-1.22.2/debian/libcogl20.docs --- cogl-1.22.0/debian/libcogl20.docs 1970-01-01 00:00:00.000000000 +0000 +++ cogl-1.22.2/debian/libcogl20.docs 2016-08-29 22:31:13.000000000 +0000 @@ -0,0 +1,2 @@ +NEWS +README diff -Nru cogl-1.22.0/debian/patches/0001-kms-winsys-don-t-wait-for-a-flip-when-page-flipping-.patch cogl-1.22.2/debian/patches/0001-kms-winsys-don-t-wait-for-a-flip-when-page-flipping-.patch --- cogl-1.22.0/debian/patches/0001-kms-winsys-don-t-wait-for-a-flip-when-page-flipping-.patch 2016-01-09 21:08:57.000000000 +0000 +++ cogl-1.22.2/debian/patches/0001-kms-winsys-don-t-wait-for-a-flip-when-page-flipping-.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -From a583492ea2aa3ea8e78c269bd5db3f52f82aa79c Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Wed, 21 Oct 2015 15:47:01 -0400 -Subject: [PATCH] kms-winsys: don't wait for a flip when page flipping fails - -If we get EACCES from drmPageFlip we're not going to get -a flip event and shouldn't wait for one. - -This commit changes the EACCES path to silently ignore the -failed flip request and just clean up the fb. - -https://bugzilla.gnome.org/show_bug.cgi?id=756926 ---- - cogl/winsys/cogl-winsys-egl-kms.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c -index 20c325c..b460907 100644 ---- a/cogl/winsys/cogl-winsys-egl-kms.c -+++ b/cogl/winsys/cogl-winsys-egl-kms.c -@@ -590,7 +590,7 @@ flip_all_crtcs (CoglDisplay *display, CoglFlipKMS *flip, int fb_id) - for (l = kms_display->crtcs; l; l = l->next) - { - CoglKmsCrtc *crtc = l->data; -- int ret; -+ int ret = 0; - - if (crtc->count == 0 || crtc->ignore) - continue; -@@ -610,7 +610,8 @@ flip_all_crtcs (CoglDisplay *display, CoglFlipKMS *flip, int fb_id) - } - } - -- flip->pending++; -+ if (ret == 0) -+ flip->pending++; - } - - if (kms_renderer->page_flips_not_supported && needs_flip) --- -2.7.0.rc3 - diff -Nru cogl-1.22.0/debian/patches/series cogl-1.22.2/debian/patches/series --- cogl-1.22.0/debian/patches/series 2016-01-09 21:25:34.000000000 +0000 +++ cogl-1.22.2/debian/patches/series 2016-08-29 21:26:31.000000000 +0000 @@ -1 +0,0 @@ -0001-kms-winsys-don-t-wait-for-a-flip-when-page-flipping-.patch diff -Nru cogl-1.22.0/debian/rules cogl-1.22.2/debian/rules --- cogl-1.22.0/debian/rules 2015-07-02 16:52:16.000000000 +0000 +++ cogl-1.22.2/debian/rules 2016-08-30 10:39:58.000000000 +0000 @@ -1,45 +1,50 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/autoreconf.mk -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/gnome.mk -include /usr/share/cdbs/1/rules/utils.mk -include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk -GNOME_MODULE = cogl - -DEB_DH_MAKESHLIBS_ARGS_libcogl20 += -V -- -c4 -DEB_DH_MAKESHLIBS_ARGS_libcogl-path20 += -V -- -c4 -DEB_DH_MAKESHLIBS_ARGS_libcogl-pango20 += -V -- -c4 -DEB_DH_MAKESHLIBS_ARGS_libcogl-gles2-20 += -V -- -c4 - -DEB_CONFIGURE_EXTRA_FLAGS += \ - --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ - --enable-gtk-doc \ - --enable-gdk-pixbuf \ - --enable-cogl-pango \ - --enable-introspection=yes \ - --enable-gl=yes \ - --enable-cogl-gst=yes +%: + dh $@ --with autoreconf,gir,gnome ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf)) - DEB_CONFIGURE_EXTRA_FLAGS += --with-default-driver=gles2 +CONFFLAGS += \ + --with-default-driver=gles2 else - DEB_CONFIGURE_EXTRA_FLAGS += --with-default-driver=gl +CONFFLAGS += \ + --with-default-driver=gl endif -DEB_CONFIGURE_EXTRA_FLAGS += \ - --enable-xlib-egl-platform=yes \ - --enable-cogl-gles2=yes \ - --with-gles2-libname=libGLESv2.so.2 \ - --enable-gles2=yes - ifeq ($(DEB_HOST_ARCH_OS),linux) -DEB_CONFIGURE_EXTRA_FLAGS += \ +CONFFLAGS += \ --enable-wayland-egl-platform \ --enable-wayland-egl-server \ - --enable-kms-egl-platform=yes + --enable-kms-egl-platform endif -common-binary-predeb-arch:: list-missing +override_dh_auto_configure: + dh_auto_configure -- \ + --enable-gtk-doc \ + --enable-gdk-pixbuf \ + --enable-cogl-pango \ + --enable-introspection \ + --enable-gl \ + --enable-cogl-gst \ + --enable-xlib-egl-platform \ + --enable-cogl-gles2 \ + --enable-gles2 \ + --with-gles2-libname=libGLESv2.so.2 \ + $(CONFFLAGS) + +override_dh_makeshlibs: + dh_makeshlibs -V -- -c4 + +override_dh_install: + dh_install --list-missing + +override_dh_strip: + dh_strip -plibcogl20 --dbgsym-migration='libcogl20-dbg (<< 1.22.2-1~)' + dh_strip -plibcogl-pango20 --dbgsym-migration='libcogl-pango20-dbg (<< 1.22.2-1~)' + dh_strip -plibcogl-gst20 --dbgsym-migration='libcogl-gst20-dbg (<< 1.22.2-1~)' + dh_strip --remaining-packages + +# disable test suite, they need a working GL/GLES environment +override_dh_auto_test: diff -Nru cogl-1.22.0/debian/watch cogl-1.22.2/debian/watch --- cogl-1.22.0/debian/watch 2012-05-01 20:52:38.000000000 +0000 +++ cogl-1.22.2/debian/watch 2016-06-04 17:53:30.000000000 +0000 @@ -1,2 +1,3 @@ -version=3 -http://download.gnome.org/sources/cogl/([\d\.]+[02468])/cogl-(.*)\.tar\.xz +version=4 +https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \ + @PACKAGE@@ANY_VERSION@\.tar\.xz diff -Nru cogl-1.22.0/deps/glib/Makefile.in cogl-1.22.2/deps/glib/Makefile.in --- cogl-1.22.0/deps/glib/Makefile.in 2015-09-16 14:00:52.000000000 +0000 +++ cogl-1.22.2/deps/glib/Makefile.in 2016-08-26 17:33:59.000000000 +0000 @@ -343,6 +343,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru cogl-1.22.0/deps/gmodule/Makefile.in cogl-1.22.2/deps/gmodule/Makefile.in --- cogl-1.22.0/deps/gmodule/Makefile.in 2015-09-16 14:00:52.000000000 +0000 +++ cogl-1.22.2/deps/gmodule/Makefile.in 2016-08-26 17:33:59.000000000 +0000 @@ -338,6 +338,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru cogl-1.22.0/deps/Makefile.in cogl-1.22.2/deps/Makefile.in --- cogl-1.22.0/deps/Makefile.in 2015-09-16 14:00:52.000000000 +0000 +++ cogl-1.22.2/deps/Makefile.in 2016-08-26 17:33:59.000000000 +0000 @@ -344,6 +344,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru cogl-1.22.0/doc/Makefile.in cogl-1.22.2/doc/Makefile.in --- cogl-1.22.0/doc/Makefile.in 2015-09-16 14:00:52.000000000 +0000 +++ cogl-1.22.2/doc/Makefile.in 2016-08-26 17:33:59.000000000 +0000 @@ -343,6 +343,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru cogl-1.22.0/doc/reference/cogl/cogl-docs.xml cogl-1.22.2/doc/reference/cogl/cogl-docs.xml --- cogl-1.22.0/doc/reference/cogl/cogl-docs.xml 2015-09-16 14:00:56.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/cogl-docs.xml 2016-08-26 17:35:02.000000000 +0000 @@ -1,7 +1,7 @@ + ]> diff -Nru cogl-1.22.0/doc/reference/cogl/html/ch01.html cogl-1.22.2/doc/reference/cogl/html/ch01.html --- cogl-1.22.0/doc/reference/cogl/html/ch01.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/ch01.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -85,6 +85,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/ch02.html cogl-1.22.2/doc/reference/cogl/html/ch02.html --- cogl-1.22.0/doc/reference/cogl/html/ch02.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/ch02.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -53,6 +53,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/ch03.html cogl-1.22.2/doc/reference/cogl/html/ch03.html --- cogl-1.22.0/doc/reference/cogl/html/ch03.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/ch03.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -60,6 +60,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-3D-textures.html cogl-1.22.2/doc/reference/cogl/html/cogl-3D-textures.html --- cogl-1.22.0/doc/reference/cogl/html/cogl-3D-textures.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-3D-textures.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -99,7 +99,7 @@ fail if the requested dimensions are not supported by the GPU.
-

Parameters

+

Parameters

@@ -131,7 +131,7 @@
-

Returns

+

Returns

A new CoglTexture3D object with no storage yet allocated.

[transfer full]

@@ -179,7 +179,7 @@ instead create a CoglBitmap for your data and use cogl_texture_3d_new_from_bitmap().
-

Parameters

+

Parameters

@@ -243,7 +243,7 @@
-

Returns

+

Returns

the newly created CoglTexture3D or NULL if there was an error and an exception will be returned through error @@ -273,7 +273,7 @@ cogl_is_texture_3d (void *object);

Checks whether the given object references a CoglTexture3D

-

Parameters

+

Parameters

@@ -288,7 +288,7 @@
-

Returns

+

Returns

TRUE if the passed object represents a 3D texture and FALSE otherwise

@@ -314,6 +314,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Bitmaps.html cogl-1.22.2/doc/reference/cogl/html/cogl-Bitmaps.html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Bitmaps.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Bitmaps.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -63,10 +63,6 @@ cogl_is_bitmap () - -#define -COGL_BITMAP_ERROR - @@ -86,6 +82,10 @@ enum CoglBitmapError + +#define +COGL_BITMAP_ERROR + @@ -105,7 +105,7 @@

Loads an image file from disk. This function can be safely called from within a thread.

-

Parameters

+

Parameters

@@ -127,7 +127,7 @@
-

Returns

+

Returns

a CoglBitmap to the new loaded image data, or NULL if loading the image failed.

[transfer full]

@@ -144,7 +144,7 @@

Parses an image file enough to extract the width and height of the bitmap.

-

Parameters

+

Parameters

@@ -171,7 +171,7 @@
-

Returns

+

Returns

TRUE if the image was successfully parsed

Since: 1.0

@@ -184,7 +184,7 @@

Checks whether object is a CoglBitmap

-

Parameters

+

Parameters

@@ -199,21 +199,13 @@
-

Returns

+

Returns

TRUE if the passed object represents a bitmap, and FALSE otherwise

Since: 1.0

-
-
-

COGL_BITMAP_ERROR

-
#define COGL_BITMAP_ERROR (cogl_bitmap_error_quark ())
-
-

CoglError domain for bitmap errors.

-

Since: 1.4

-

Types and Values

@@ -230,7 +222,7 @@ example, if GdkPixbuf is used then errors GdkPixbufErrors will be used directly.

-

Members

+

Members

@@ -265,9 +257,17 @@

Since: 1.4

+
+
+

COGL_BITMAP_ERROR

+
#define COGL_BITMAP_ERROR (cogl_bitmap_error_quark ())
+
+

CoglError domain for bitmap errors.

+

Since: 1.4

+
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Blend-Strings.html cogl-1.22.2/doc/reference/cogl/html/cogl-Blend-Strings.html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Blend-Strings.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Blend-Strings.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -134,6 +134,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Buffers.html cogl-1.22.2/doc/reference/cogl/html/cogl-Buffers.html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Buffers.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Buffers.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -174,7 +174,7 @@

Checks whether buffer is a buffer object.

-

Parameters

+

Parameters

@@ -189,7 +189,7 @@
-

Returns

+

Returns

TRUE if the handle is a CoglBuffer, and FALSE otherwise

Since: 1.2

@@ -215,7 +215,7 @@ cogl_buffer_get_size (CoglBuffer *buffer);

Retrieves the size of buffer

-

Parameters

+

Parameters

@@ -230,7 +230,7 @@
-

Returns

+

Returns

the size of the buffer in bytes

Since: 1.2

@@ -258,7 +258,7 @@

Sets the update hint on a buffer. See CoglBufferUpdateHint for a description of the available hints.

-

Parameters

+

Parameters

@@ -302,7 +302,7 @@ cogl_buffer_get_update_hint (CoglBuffer *buffer);

Retrieves the update hints set using cogl_buffer_set_update_hint()

-

Parameters

+

Parameters

@@ -317,7 +317,7 @@
-

Returns

+

Returns

the CoglBufferUpdateHint currently used by the buffer

Since: 1.2

@@ -357,7 +357,7 @@ mask you pass. It is also an error to release your last reference while the buffer is mapped.

-

Parameters

+

Parameters

@@ -385,7 +385,7 @@
-

Returns

+

Returns

A pointer to the mapped memory or NULL is the call fails.

[transfer none]

@@ -413,7 +413,7 @@ cogl_buffer_unmap (CoglBuffer *buffer);

Unmaps a buffer previously mapped by cogl_buffer_map().

-

Parameters

+

Parameters

@@ -459,7 +459,7 @@ should be less than the buffer size.

-

Parameters

+

Parameters

@@ -491,7 +491,7 @@
-

Returns

+

Returns

TRUE is the operation succeeded, FALSE otherwise

Since: 1.2

@@ -528,7 +528,7 @@ and immediately copied into the new buffer.

-

Parameters

+

Parameters

@@ -555,7 +555,7 @@
-

Returns

+

Returns

a newly allocated CoglPixelBuffer.

[transfer full]

@@ -583,7 +583,7 @@

Checks whether object is a pixel buffer.

-

Parameters

+

Parameters

@@ -598,7 +598,7 @@
-

Returns

+

Returns

TRUE if the object is a pixel buffer, and FALSE otherwise

@@ -627,7 +627,7 @@

The update hint on a buffer allows the user to give some detail on how often the buffer data is going to be updated.

-

Members

+

Members

@@ -681,7 +681,7 @@

enum CoglBufferAccess

The access hints for cogl_buffer_set_update_hint()

-

Members

+

Members

@@ -733,6 +733,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Clipping-(Deprecated).html cogl-1.22.2/doc/reference/cogl/html/cogl-Clipping-(Deprecated).html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Clipping-(Deprecated).html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Clipping-(Deprecated).html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -110,7 +110,7 @@

The rectangle is intersected with the current clip region. To undo the effect of this function, call cogl_clip_pop().

-

Parameters

+

Parameters

@@ -162,7 +162,7 @@

The rectangle is intersected with the current clip region. To undo the effect of this function, call cogl_clip_pop().

-

Parameters

+

Parameters

@@ -252,6 +252,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Clipping.html cogl-1.22.2/doc/reference/cogl/html/cogl-Clipping.html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Clipping.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Clipping.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -94,7 +94,7 @@

The rectangle is intersected with the current clip region. To undo the effect of this function, call cogl_clip_pop().

-

Parameters

+

Parameters

@@ -147,7 +147,7 @@

The rectangle is intersected with the current clip region. To undo the effect of this function, call cogl_clip_pop().

-

Parameters

+

Parameters

@@ -198,6 +198,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Color-Type.html cogl-1.22.2/doc/reference/cogl/html/cogl-Color-Type.html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Color-Type.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Color-Type.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -360,7 +360,7 @@ cogl_color_new (void);

Creates a new (empty) color

-

Returns

+

Returns

a newly-allocated CoglColor. Use cogl_color_free() to free the allocated resources

@@ -374,7 +374,7 @@

Creates a copy of color

-

Parameters

+

Parameters

@@ -389,7 +389,7 @@
-

Returns

+

Returns

a newly-allocated CoglColor. Use cogl_color_free() to free the allocate resources

@@ -402,7 +402,7 @@ cogl_color_free (CoglColor *color);

Frees the resources allocated by cogl_color_new() and cogl_color_copy()

-

Parameters

+

Parameters

@@ -429,7 +429,7 @@ float alpha);

Sets the values of the passed channels into a CoglColor

-

Parameters

+

Parameters

@@ -475,7 +475,7 @@ const float *color_array);

Sets the values of the passed channels into a CoglColor

-

Parameters

+

Parameters

@@ -509,7 +509,7 @@ uint8_t alpha);

Sets the values of the passed channels into a CoglColor.

-

Parameters

+

Parameters

@@ -562,7 +562,7 @@

Sets the values of the passed channels into a CoglColor.

-

Parameters

+

Parameters

@@ -615,7 +615,7 @@

Sets the values of the passed channels into a CoglColor

-

Parameters

+

Parameters

@@ -662,7 +662,7 @@ as a fixed point value between 0 and 1.0.

-

Parameters

+

Parameters

@@ -677,7 +677,7 @@
-

Returns

+

Returns

the red channel of the passed color

Since: 1.0

@@ -691,7 +691,7 @@ as a fixed point value between 0 and 1.0.

-

Parameters

+

Parameters

@@ -706,7 +706,7 @@
-

Returns

+

Returns

the green channel of the passed color

Since: 1.0

@@ -720,7 +720,7 @@ as a fixed point value between 0 and 1.0.

-

Parameters

+

Parameters

@@ -735,7 +735,7 @@
-

Returns

+

Returns

the blue channel of the passed color

Since: 1.0

@@ -749,7 +749,7 @@ as a fixed point value between 0 and 1.0.

-

Parameters

+

Parameters

@@ -764,7 +764,7 @@
-

Returns

+

Returns

the alpha channel of the passed color

Since: 1.0

@@ -778,7 +778,7 @@ as a byte value between 0 and 255

-

Parameters

+

Parameters

@@ -793,7 +793,7 @@
-

Returns

+

Returns

the red channel of the passed color

Since: 1.0

@@ -807,7 +807,7 @@ as a byte value between 0 and 255

-

Parameters

+

Parameters

@@ -822,7 +822,7 @@
-

Returns

+

Returns

the green channel of the passed color

Since: 1.0

@@ -836,7 +836,7 @@ as a byte value between 0 and 255

-

Parameters

+

Parameters

@@ -851,7 +851,7 @@
-

Returns

+

Returns

the blue channel of the passed color

Since: 1.0

@@ -865,7 +865,7 @@ as a byte value between 0 and 255

-

Parameters

+

Parameters

@@ -880,7 +880,7 @@
-

Returns

+

Returns

the alpha channel of the passed color

Since: 1.0

@@ -894,7 +894,7 @@ as a floating point value between 0.0 and 1.0

-

Parameters

+

Parameters

@@ -909,7 +909,7 @@
-

Returns

+

Returns

the red channel of the passed color

Since: 1.0

@@ -923,7 +923,7 @@ as a floating point value between 0.0 and 1.0

-

Parameters

+

Parameters

@@ -938,7 +938,7 @@
-

Returns

+

Returns

the green channel of the passed color

Since: 1.0

@@ -952,7 +952,7 @@ as a floating point value between 0.0 and 1.0

-

Parameters

+

Parameters

@@ -967,7 +967,7 @@
-

Returns

+

Returns

the blue channel of the passed color

Since: 1.0

@@ -981,7 +981,7 @@ as a floating point value between 0.0 and 1.0

-

Parameters

+

Parameters

@@ -996,7 +996,7 @@
-

Returns

+

Returns

the alpha channel of the passed color

Since: 1.0

@@ -1011,7 +1011,7 @@ to red .

-

Parameters

+

Parameters

@@ -1044,7 +1044,7 @@ to green .

-

Parameters

+

Parameters

@@ -1077,7 +1077,7 @@ to blue .

-

Parameters

+

Parameters

@@ -1110,7 +1110,7 @@ to alpha .

-

Parameters

+

Parameters

@@ -1143,7 +1143,7 @@ to red .

-

Parameters

+

Parameters

@@ -1176,7 +1176,7 @@ to green .

-

Parameters

+

Parameters

@@ -1209,7 +1209,7 @@ to blue .

-

Parameters

+

Parameters

@@ -1242,7 +1242,7 @@ to alpha .

-

Parameters

+

Parameters

@@ -1275,7 +1275,7 @@ to red .

-

Parameters

+

Parameters

@@ -1308,7 +1308,7 @@ to green .

-

Parameters

+

Parameters

@@ -1341,7 +1341,7 @@ to blue .

-

Parameters

+

Parameters

@@ -1374,7 +1374,7 @@ to alpha .

-

Parameters

+

Parameters

@@ -1406,7 +1406,7 @@ example, semi-transparent red is (1.0, 0, 0, 0.5) when non-premultiplied and (0.5, 0, 0, 0.5) when premultiplied.

-

Parameters

+

Parameters

@@ -1431,7 +1431,7 @@ example, semi-transparent red is (0.5, 0, 0, 0.5) when premultiplied and (1.0, 0, 0, 0.5) when non-premultiplied.

-

Parameters

+

Parameters

@@ -1458,7 +1458,7 @@ parameter, when using CoglColors as keys in a GHashTable.

-

Parameters

+

Parameters

@@ -1480,7 +1480,7 @@
-

Returns

+

Returns

TRUE if the two colors are the same.

Since: 1.0

@@ -1496,7 +1496,7 @@

Converts a color expressed in HLS (hue, luminance and saturation) values into a CoglColor.

-

Parameters

+

Parameters

@@ -1545,7 +1545,7 @@ saturation values are in the 0 .. 1 range.

-

Parameters

+

Parameters

@@ -1590,7 +1590,7 @@ the CoglColor structure are private and should never by accessed directly.

-

Members

+

Members

@@ -1605,6 +1605,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl.devhelp2 cogl-1.22.2/doc/reference/cogl/html/cogl.devhelp2 --- cogl-1.22.0/doc/reference/cogl/html/cogl.devhelp2 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl.devhelp2 2016-08-26 17:38:09.000000000 +0000 @@ -180,7 +180,6 @@ - @@ -212,6 +211,7 @@ + @@ -290,13 +290,9 @@ - - - - - + @@ -305,19 +301,6 @@ - - - - - - - - - - - - - @@ -326,11 +309,6 @@ - - - - - @@ -352,6 +330,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Fixed-Point-API.html cogl-1.22.2/doc/reference/cogl/html/cogl-Fixed-Point-API.html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Fixed-Point-API.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Fixed-Point-API.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,22 +41,6 @@ - - - - - - - - - - - - - - - - @@ -105,58 +89,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -204,26 +136,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -390,6 +302,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -432,46 +432,13 @@

Functions

-

COGL_FIXED_BITS

-
#define COGL_FIXED_BITS         (32)
-
-

Evaluates to the number of bits used by the CoglFixed type.

-

Since: 1.0

-
-
-
-

COGL_FIXED_Q

-
#define COGL_FIXED_Q            (COGL_FIXED_BITS - 16)
-
-

Evaluates to the number of bits used for the non-integer part -of the CoglFixed type.

-

Since: 1.0

-
-
-
-

COGL_FIXED_MAX

-
#define COGL_FIXED_MAX          (0x7fffffff)
-
-

The biggest number representable using CoglFixed

-

Since: 1.0

-
-
-
-

COGL_FIXED_MIN

-
#define COGL_FIXED_MIN          (0x80000000)
-
-

The smallest number representable using CoglFixed

-

Since: 1.0

-
-
-

COGL_FIXED_FROM_FLOAT()

#define COGL_FIXED_FROM_FLOAT(x)        ((float) cogl_double_to_fixed (x))

Converts x from a floating point to a fixed point notation.

-

Parameters

+

Parameters

#defineCOGL_FIXED_BITS
#defineCOGL_FIXED_Q
#defineCOGL_FIXED_MAX
#defineCOGL_FIXED_MIN
#define COGL_FIXED_FROM_FLOAT()
#defineCOGL_FIXED_EPSILON
#defineCOGL_FIXED_1
#defineCOGL_FIXED_0_5
#defineCOGL_FIXED_30
#defineCOGL_FIXED_45
#defineCOGL_FIXED_60
#defineCOGL_FIXED_90
#defineCOGL_FIXED_120
#defineCOGL_FIXED_180
#defineCOGL_FIXED_240
#defineCOGL_FIXED_255
#defineCOGL_FIXED_270
#defineCOGL_FIXED_360
#define COGL_FIXED_MUL()
#defineCOGL_FIXED_2_PI
#defineCOGL_FIXED_PI
#defineCOGL_FIXED_PI_2
#defineCOGL_FIXED_PI_4
#defineCOGL_RADIANS_TO_DEGREES
int
#defineCOGL_FIXED_BITS
#defineCOGL_FIXED_Q
#defineCOGL_FIXED_MAX
#defineCOGL_FIXED_MIN
#defineCOGL_FIXED_EPSILON
#defineCOGL_FIXED_1
#defineCOGL_FIXED_0_5
#defineCOGL_FIXED_30
#defineCOGL_FIXED_45
#defineCOGL_FIXED_60
#defineCOGL_FIXED_90
#defineCOGL_FIXED_120
#defineCOGL_FIXED_180
#defineCOGL_FIXED_240
#defineCOGL_FIXED_255
#defineCOGL_FIXED_270
#defineCOGL_FIXED_360
#defineCOGL_FIXED_2_PI
#defineCOGL_FIXED_PI
#defineCOGL_FIXED_PI_2
#defineCOGL_FIXED_PI_4
#defineCOGL_RADIANS_TO_DEGREES
#define COGL_SQRTI_ARG_10_PERCENT
@@ -496,7 +463,7 @@ from a fixed point to a floating point notation, in single precision.

-

Parameters

+

Parameters

@@ -520,7 +487,7 @@

Converts x from an integer to a fixed point notation.

-

Parameters

+

Parameters

@@ -545,7 +512,7 @@ from a fixed point notation to an integer, dropping the fractional part without rounding.

-

Parameters

+

Parameters

@@ -570,7 +537,7 @@ from a double precision, floating point to a fixed point notation.

-

Parameters

+

Parameters

@@ -595,7 +562,7 @@ from a fixed point to a floating point notation, in double precision.

-

Parameters

+

Parameters

@@ -619,148 +586,44 @@

Converts x from a floating point notation to a signed integer.

-

Parameters

-
----- - - - - - -

x

a floatint point number

 
-
-

Since: 1.0

-
-
-
-

COGL_FLOAT_TO_UINT()

-
#define COGL_FLOAT_TO_UINT(x)           (cogl_double_to_uint ((x)))
-
-

Converts x - from a floating point notation to an unsigned integer.

-
-

Parameters

+

Parameters

- - - - - -

x

a floatint point number

 
-
-

Since: 1.0

-
-
-
-

COGL_FIXED_EPSILON

-
#define COGL_FIXED_EPSILON      (1)
-
-

A very small number expressed as a CoglFixed number.

-

Since: 1.0

-
-
-
-

COGL_FIXED_1

-
#define COGL_FIXED_1            (1 << COGL_FIXED_Q)
-
-

The number 1 expressed as a CoglFixed number.

-

Since: 1.0

-
-
-
-

COGL_FIXED_0_5

-
#define COGL_FIXED_0_5          (32768)
-
-

The number 0.5 expressed as a CoglFixed number.

-

Since: 1.0

-
-
-
-

COGL_FIXED_30

-
#define COGL_FIXED_30           (COGL_FIXED_FROM_INT (30))
-
-

Evaluates to the number 30 in fixed point notation.

-

Since: 1.0

-
-
-
-

COGL_FIXED_45

-
#define COGL_FIXED_45           (COGL_FIXED_FROM_INT (45))
-
-

Evaluates to the number 45 in fixed point notation.

-

Since: 1.0

-
-
-
-

COGL_FIXED_60

-
#define COGL_FIXED_60           (COGL_FIXED_FROM_INT (60))
-
-

Evaluates to the number 60 in fixed point notation.

-

Since: 1.0

-
-
-
-

COGL_FIXED_90

-
#define COGL_FIXED_90           (COGL_FIXED_FROM_INT (90))
-
-

Evaluates to the number 90 in fixed point notation.

-

Since: 1.0

-
-
-
-

COGL_FIXED_120

-
#define COGL_FIXED_120          (COGL_FIXED_FROM_INT (120))
-
-

Evaluates to the number 120 in fixed point notation.

-

Since: 1.0

-
-
-
-

COGL_FIXED_180

-
#define COGL_FIXED_180          (COGL_FIXED_FROM_INT (180))
-
-

Evaluates to the number 180 in fixed point notation.

-

Since: 1.0

-
-
-
-

COGL_FIXED_240

-
#define COGL_FIXED_240          (COGL_FIXED_FROM_INT (240))
-
-

Evaluates to the number 240 in fixed point notation.

-

Since: 1.0

+ +

x

+

a floatint point number

+  + +
-
-
-

COGL_FIXED_255

-
#define COGL_FIXED_255          (COGL_FIXED_FROM_INT (255))
-
-

Evaluates to the number 255 in fixed point notation.

Since: 1.0

-

COGL_FIXED_270

-
#define COGL_FIXED_270          (COGL_FIXED_FROM_INT (270))
+
COGL_FLOAT_TO_UINT()

+
#define COGL_FLOAT_TO_UINT(x)           (cogl_double_to_uint ((x)))
 

-
Evaluates to the number 270 in fixed point notation.

-
Since: 1.0

+
Converts x
+ from a floating point notation to an unsigned integer.

+

+
Parameters

+

+++++
+
+
+
+
+
+





x
a floatint point number
 

 

-

-

-
COGL_FIXED_360

-
#define COGL_FIXED_360          (COGL_FIXED_FROM_INT (360))
-

-
Evaluates to the number 360 in fixed point notation.

 
Since: 1.0

 

 

@@ -770,7 +633,7 @@

Computes (a * b).

-

Parameters

+

Parameters

@@ -800,7 +663,7 @@

Computes (a / b).

-

Parameters

+

Parameters

@@ -843,7 +706,7 @@

But it is shorter to type.

-

Parameters

+

Parameters

@@ -880,7 +743,7 @@
This macro might lose precision. If the precision of the result is important use COGL_FIXED_DIV instead.
-

Parameters

+

Parameters

@@ -912,7 +775,7 @@
This macro might lose precision. If the precision of the result is important use COGL_FIXED_MUL instead.
-

Parameters

+

Parameters

@@ -943,7 +806,7 @@

Retrieves the fractionary part of x .

-

Parameters

+

Parameters

@@ -965,7 +828,7 @@ 
#define             COGL_FIXED_FLOOR(x)

Rounds down a fixed point number to the previous integer.

-

Parameters

+

Parameters

@@ -988,7 +851,7 @@

Rounds up a fixed point number to the next integer.

-

Parameters

+

Parameters

@@ -1006,46 +869,6 @@
-

COGL_FIXED_2_PI

-
#define COGL_FIXED_2_PI         (0x0006487f)
-
-

Two times pi, expressed as a CoglFixed number.

-

Since: 1.0

-
-
-
-

COGL_FIXED_PI

-
#define COGL_FIXED_PI           (0x0003243f)
-
-

The number pi, expressed as a CoglFixed number.

-

Since: 1.0

-
-
-
-

COGL_FIXED_PI_2

-
#define COGL_FIXED_PI_2         (0x00019220)
-
-

Half pi, expressed as a CoglFixed number.

-

Since: 1.0

-
-
-
-

COGL_FIXED_PI_4

-
#define COGL_FIXED_PI_4         (0x0000c910)
-
-

pi / 4, expressed as CoglFixed number.

-

Since: 1.0

-
-
-
-

COGL_RADIANS_TO_DEGREES

-
#define COGL_RADIANS_TO_DEGREES (0x394bb8)
-
-

Evaluates to 180 / pi in fixed point notation.

-

Since: 1.0

-
-
-

cogl_sqrti ()

int
 cogl_sqrti (int x);
@@ -1056,7 +879,7 @@ for narguments smaller than COGL_SQRTI_ARG_10_PERCENT. The maximum argument that can be passed to this function is COGL_SQRTI_ARG_MAX.

-

Parameters

+

Parameters

@@ -1071,7 +894,7 @@
-

Returns

+

Returns

integer square root.

Since: 1.0

@@ -1087,7 +910,7 @@ but uses the sign of both arguments to return the angle in right quadrant.

-

Parameters

+

Parameters

@@ -1109,7 +932,7 @@
-

Returns

+

Returns

the arc tangent of the passed fraction, in fixed point notation

@@ -1123,7 +946,7 @@

Computes the arc tangent of a .

-

Parameters

+

Parameters

@@ -1138,7 +961,7 @@
-

Returns

+

Returns

the arc tangent of the passed value, in fixed point notation

Since: 1.0

@@ -1151,7 +974,7 @@

Computes the cosine of angle .

-

Parameters

+

Parameters

@@ -1166,7 +989,7 @@
-

Returns

+

Returns

the cosine of the passed angle, in fixed point notation

Since: 1.0

@@ -1180,7 +1003,7 @@

This function is some 2.5 times faster on x86, and over 12 times faster on fpu-less arm, than using libc log().

-

Parameters

+

Parameters

@@ -1195,7 +1018,7 @@
-

Returns

+

Returns

base 2 logarithm.

Since: 1.0

@@ -1210,7 +1033,7 @@ to the y power.

-

Parameters

+

Parameters

@@ -1232,7 +1055,7 @@
-

Returns

+

Returns

the power of x to the y

@@ -1249,7 +1072,7 @@

This function is around 11 times faster on x86, and around 22 times faster on fpu-less arm than libc pow(2, x).

-

Parameters

+

Parameters

@@ -1264,7 +1087,7 @@
-

Returns

+

Returns

the power of 2 to the passed value

Since: 1.0

@@ -1277,7 +1100,7 @@

Computes the sine of angle .

-

Parameters

+

Parameters

@@ -1292,7 +1115,7 @@
-

Returns

+

Returns

the sine of the passed angle, in fixed point notation

Since: 1.0

@@ -1305,7 +1128,7 @@

Computes the square root of x .

-

Parameters

+

Parameters

@@ -1320,7 +1143,7 @@
-

Returns

+

Returns

the square root of the passed value, in floating point notation

@@ -1334,7 +1157,7 @@

Computes the tangent of angle .

-

Parameters

+

Parameters

@@ -1349,7 +1172,7 @@
-

Returns

+

Returns

the tangent of the passed angle, in fixed point notation

Since: 1.0

@@ -1383,7 +1206,7 @@

Converts an angle in degrees into a CoglAngle.

-

Parameters

+

Parameters

@@ -1406,7 +1229,7 @@

Converts an angle in degrees into a CoglAngle.

-

Parameters

+

Parameters

@@ -1430,7 +1253,7 @@

Converts a CoglAngle into an angle in degrees, using floatint point notation.

-

Parameters

+

Parameters

@@ -1453,7 +1276,7 @@

Converts a CoglAngle into an angle in degrees, using fixed point notation

-

Parameters

+

Parameters

@@ -1477,7 +1300,7 @@

Computes the cosine of angle

-

Parameters

+

Parameters

@@ -1492,7 +1315,7 @@
-

Returns

+

Returns

the cosine of the passed angle

Since: 1.0

@@ -1505,7 +1328,7 @@

Computes the sine of angle

-

Parameters

+

Parameters

@@ -1520,7 +1343,7 @@
-

Returns

+

Returns

the sine of the passed angle

Since: 1.0

@@ -1533,7 +1356,7 @@

Computes the tangent of angle

-

Parameters

+

Parameters

@@ -1548,7 +1371,7 @@
-

Returns

+

Returns

the tangent of the passed angle

Since: 1.0

@@ -1564,6 +1387,183 @@
+

COGL_FIXED_BITS

+
#define COGL_FIXED_BITS         (32)
+
+

Evaluates to the number of bits used by the CoglFixed type.

+

Since: 1.0

+
+
+
+

COGL_FIXED_Q

+
#define COGL_FIXED_Q            (COGL_FIXED_BITS - 16)
+
+

Evaluates to the number of bits used for the non-integer part +of the CoglFixed type.

+

Since: 1.0

+
+
+
+

COGL_FIXED_MAX

+
#define COGL_FIXED_MAX          (0x7fffffff)
+
+

The biggest number representable using CoglFixed

+

Since: 1.0

+
+
+
+

COGL_FIXED_MIN

+
#define COGL_FIXED_MIN          (0x80000000)
+
+

The smallest number representable using CoglFixed

+

Since: 1.0

+
+
+
+

COGL_FIXED_EPSILON

+
#define COGL_FIXED_EPSILON      (1)
+
+

A very small number expressed as a CoglFixed number.

+

Since: 1.0

+
+
+
+

COGL_FIXED_1

+
#define COGL_FIXED_1            (1 << COGL_FIXED_Q)
+
+

The number 1 expressed as a CoglFixed number.

+

Since: 1.0

+
+
+
+

COGL_FIXED_0_5

+
#define COGL_FIXED_0_5          (32768)
+
+

The number 0.5 expressed as a CoglFixed number.

+

Since: 1.0

+
+
+
+

COGL_FIXED_30

+
#define COGL_FIXED_30           (COGL_FIXED_FROM_INT (30))
+
+

Evaluates to the number 30 in fixed point notation.

+

Since: 1.0

+
+
+
+

COGL_FIXED_45

+
#define COGL_FIXED_45           (COGL_FIXED_FROM_INT (45))
+
+

Evaluates to the number 45 in fixed point notation.

+

Since: 1.0

+
+
+
+

COGL_FIXED_60

+
#define COGL_FIXED_60           (COGL_FIXED_FROM_INT (60))
+
+

Evaluates to the number 60 in fixed point notation.

+

Since: 1.0

+
+
+
+

COGL_FIXED_90

+
#define COGL_FIXED_90           (COGL_FIXED_FROM_INT (90))
+
+

Evaluates to the number 90 in fixed point notation.

+

Since: 1.0

+
+
+
+

COGL_FIXED_120

+
#define COGL_FIXED_120          (COGL_FIXED_FROM_INT (120))
+
+

Evaluates to the number 120 in fixed point notation.

+

Since: 1.0

+
+
+
+

COGL_FIXED_180

+
#define COGL_FIXED_180          (COGL_FIXED_FROM_INT (180))
+
+

Evaluates to the number 180 in fixed point notation.

+

Since: 1.0

+
+
+
+

COGL_FIXED_240

+
#define COGL_FIXED_240          (COGL_FIXED_FROM_INT (240))
+
+

Evaluates to the number 240 in fixed point notation.

+

Since: 1.0

+
+
+
+

COGL_FIXED_255

+
#define COGL_FIXED_255          (COGL_FIXED_FROM_INT (255))
+
+

Evaluates to the number 255 in fixed point notation.

+

Since: 1.0

+
+
+
+

COGL_FIXED_270

+
#define COGL_FIXED_270          (COGL_FIXED_FROM_INT (270))
+
+

Evaluates to the number 270 in fixed point notation.

+

Since: 1.0

+
+
+
+

COGL_FIXED_360

+
#define COGL_FIXED_360          (COGL_FIXED_FROM_INT (360))
+
+

Evaluates to the number 360 in fixed point notation.

+

Since: 1.0

+
+
+
+

COGL_FIXED_2_PI

+
#define COGL_FIXED_2_PI         (0x0006487f)
+
+

Two times pi, expressed as a CoglFixed number.

+

Since: 1.0

+
+
+
+

COGL_FIXED_PI

+
#define COGL_FIXED_PI           (0x0003243f)
+
+

The number pi, expressed as a CoglFixed number.

+

Since: 1.0

+
+
+
+

COGL_FIXED_PI_2

+
#define COGL_FIXED_PI_2         (0x00019220)
+
+

Half pi, expressed as a CoglFixed number.

+

Since: 1.0

+
+
+
+

COGL_FIXED_PI_4

+
#define COGL_FIXED_PI_4         (0x0000c910)
+
+

pi / 4, expressed as CoglFixed number.

+

Since: 1.0

+
+
+
+

COGL_RADIANS_TO_DEGREES

+
#define COGL_RADIANS_TO_DEGREES (0x394bb8)
+
+

Evaluates to 180 / pi in fixed point notation.

+

Since: 1.0

+
+
+

COGL_SQRTI_ARG_10_PERCENT

#define COGL_SQRTI_ARG_10_PERCENT 5590
@@ -1600,6 +1600,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25
\ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-General-API-(Deprecated).html cogl-1.22.2/doc/reference/cogl/html/cogl-General-API-(Deprecated).html --- cogl-1.22.0/doc/reference/cogl/html/cogl-General-API-(Deprecated).html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-General-API-(Deprecated).html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -114,7 +114,7 @@ occurs in list of extensions in ext .

-

Parameters

+

Parameters

@@ -136,7 +136,7 @@
-

Returns

+

Returns

TRUE if the extension occurs in the list, FALSE otherwise.

@@ -152,7 +152,7 @@

Replace the current viewport with the given values.

-

Parameters

+

Parameters

@@ -192,7 +192,7 @@ in the color buffer. Pass NULL for any of the arguments if the value is not required.

-

Parameters

+

Parameters

@@ -239,7 +239,7 @@ clutter_actor_lower(), otherwise it will also take into account the actor's depth. Depth testing is disabled by default.

-

Parameters

+

Parameters

@@ -265,7 +265,7 @@

Queries if depth testing has been enabled via cogl_set_depth_test_enable()

-

Returns

+

Returns

TRUE if depth testing is enabled, and FALSE otherwise

@@ -275,6 +275,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-General-API.html cogl-1.22.2/doc/reference/cogl/html/cogl-General-API.html --- cogl-1.22.0/doc/reference/cogl/html/cogl-General-API.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-General-API.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -455,7 +455,7 @@ by 1

[skip]

-

Parameters

+

Parameters

@@ -470,7 +470,7 @@
-

Returns

+

Returns

the object , with its reference count increased

@@ -486,7 +486,7 @@ will be freed

[skip]

-

Parameters

+

Parameters

@@ -516,7 +516,7 @@ this function returns NULL.

[skip]

-

Parameters

+

Parameters

@@ -539,7 +539,7 @@
-

Returns

+

Returns

The user data previously associated with object using the given key @@ -565,7 +565,7 @@ .

[skip]

-

Parameters

+

Parameters

@@ -610,7 +610,7 @@

Increases the reference count of handle by 1

-

Parameters

+

Parameters

@@ -625,7 +625,7 @@
-

Returns

+

Returns

the handle, with its reference count increased.

[transfer none]

@@ -640,7 +640,7 @@ count reaches 0, the resources allocated by handle will be freed

-

Parameters

+

Parameters

@@ -675,7 +675,7 @@

Returns all of the features supported by COGL.

-

Returns

+

Returns

A logical OR of all the supported COGL features.

Since: 0.8

@@ -694,7 +694,7 @@ operator. TRUE is only returned if all of the requested features are available.

-

Parameters

+

Parameters

@@ -709,7 +709,7 @@
-

Returns

+

Returns

TRUE if the features are available, FALSE otherwise.

@@ -725,7 +725,7 @@ symbols since eglGetProcAddress for example doesn't allow this and and may return a junk pointer if you do.
-

Parameters

+

Parameters

@@ -740,7 +740,7 @@
-

Returns

+

Returns

a pointer to the requested function or NULL if the function is not available.

@@ -758,7 +758,7 @@ line options. Clutter uses this to handle the Cogl command line options during its initialization process.

-

Returns

+

Returns

a GOptionGroup

Since: 1.0

@@ -800,7 +800,7 @@

Multiplies the current model-view matrix by one that scales the x, y and z axes by the given values.

-

Parameters

+

Parameters

@@ -841,7 +841,7 @@

Multiplies the current model-view matrix by one that translates the model along all three axes according to the given values.

-

Parameters

+

Parameters

@@ -889,7 +889,7 @@ degrees about the vertex (0, 0, 1) causes a small counter-clockwise rotation.

-

Parameters

+

Parameters

@@ -932,7 +932,7 @@

Multiplies the current model-view matrix by the given matrix.

-

Parameters

+

Parameters

@@ -966,7 +966,7 @@ for a given viewing frustum defined by 4 side clip planes that all cross through the origin and 2 near and far clip planes.

-

Parameters

+

Parameters

@@ -1032,7 +1032,7 @@ since there wont be enough precision to identify the depth of objects near to each other.
-

Parameters

+

Parameters

@@ -1092,7 +1092,7 @@ the z clipping planes which would have been consistent with the left, right bottom and top arguments.
-

Parameters

+

Parameters

@@ -1150,7 +1150,7 @@

Stores the current model-view matrix in matrix .

-

Parameters

+

Parameters

@@ -1178,7 +1178,7 @@

Loads matrix as the new model-view matrix.

-

Parameters

+

Parameters

@@ -1206,7 +1206,7 @@

Stores the current projection matrix in matrix .

-

Parameters

+

Parameters

@@ -1233,7 +1233,7 @@

Loads matrix as the new projection matrix.

-

Parameters

+

Parameters

@@ -1262,7 +1262,7 @@

Replaces the current viewport with the given values.

-

Parameters

+

Parameters

@@ -1314,7 +1314,7 @@ [3] get the width and height.

-

Parameters

+

Parameters

@@ -1345,7 +1345,7 @@ that includes the color buffer then the specified color is used.

-

Parameters

+

Parameters

@@ -1383,7 +1383,7 @@ only affects calls to the cogl_rectangle* family of functions and cogl_vertex_buffer_draw*. Backface culling is disabled by default.

-

Parameters

+

Parameters

@@ -1410,7 +1410,7 @@

Queries if backface culling has been enabled via cogl_set_backface_culling_enabled()

-

Returns

+

Returns

TRUE if backface culling is enabled, and FALSE otherwise

@@ -1444,7 +1444,7 @@ opaque primitives. This might improve in the future when we can depend on fragment shaders.
-

Parameters

+

Parameters

@@ -1511,7 +1511,7 @@ process subsequent primitives, such as rectangles drawn with cogl_rectangle() or vertices drawn using cogl_vertex_buffer_draw().

-

Parameters

+

Parameters

@@ -1547,7 +1547,7 @@

See also cogl_set_source_color4ub() and cogl_set_source_color4f() if you already have the color components.

-

Parameters

+

Parameters

@@ -1583,7 +1583,7 @@

The value for each component is an unsigned byte in the range between 0 and 255.

-

Parameters

+

Parameters

@@ -1637,7 +1637,7 @@ between 0 and 1.0. If the values passed in are outside that range, they will be clamped.

-

Parameters

+

Parameters

@@ -1695,7 +1695,7 @@ cogl_set_source (material);
-

Parameters

+

Parameters

@@ -1730,7 +1730,7 @@ reference to an internally managed materials and the result of modifying such materials is undefined.
-

Returns

+

Returns

The current source material.

Since: 1.6

@@ -1751,7 +1751,7 @@ material at the top of this stack defines the GPU state used to process later primitives as defined by cogl_set_source().

-

Parameters

+

Parameters

@@ -1808,7 +1808,7 @@ specify a format that doesn't use an alpha channel or use one of the formats ending in PRE.

-

Parameters

+

Parameters

@@ -2068,7 +2068,7 @@

-

Members

+

Members

@@ -2120,7 +2120,7 @@ internal format. Cogl will try to pick the best format to use internally and convert the texture data if necessary.

-

Members

+

Members

@@ -2351,7 +2351,7 @@

enum CoglBufferTarget

Target flags for FBOs.

-

Members

+

Members

@@ -2383,7 +2383,7 @@

enum CoglBufferBit

Types of auxiliary buffers

-

Members

+

Members

@@ -2422,7 +2422,7 @@

enum CoglAttributeType

Data types for the components of a vertex attribute.

-

Members

+

Members

@@ -2477,7 +2477,7 @@

enum CoglFeatureFlags

Flags for the supported features.

-

Members

+

Members

@@ -2694,7 +2694,7 @@

Where eye_distance is the distance of the current fragment in eye coordinates from the origin.

-

Members

+

Members

@@ -2769,7 +2769,7 @@

enum CoglReadPixelsFlags

Flags for cogl_framebuffer_read_pixels_into_bitmap()

-

Members

+

Members

@@ -2790,6 +2790,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/coglglossary.html cogl-1.22.2/doc/reference/cogl/html/coglglossary.html --- cogl-1.22.0/doc/reference/cogl/html/coglglossary.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/coglglossary.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -69,6 +69,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-GType-Integration-API.html cogl-1.22.2/doc/reference/cogl/html/cogl-GType-Integration-API.html --- cogl-1.22.0/doc/reference/cogl/html/cogl-GType-Integration-API.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-GType-Integration-API.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -62,7 +62,7 @@

Use cogl_matrix_get_gtype() instead.

-

Returns

+

Returns

the GType for the registered "CoglMatrix" boxed type. This can be used for example to define GObject properties that accept a CoglMatrix value.

@@ -74,6 +74,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Materials-(Deprecated).html cogl-1.22.2/doc/reference/cogl/html/cogl-Materials-(Deprecated).html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Materials-(Deprecated).html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Materials-(Deprecated).html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -80,7 +80,7 @@

Increment the reference count for a CoglMaterial.

-

Parameters

+

Parameters

@@ -95,7 +95,7 @@
-

Returns

+

Returns

the material .

@@ -112,7 +112,7 @@

Decrement the reference count for a CoglMaterial.

-

Parameters

+

Parameters

@@ -147,7 +147,7 @@ way and so you would have to re-get the list in that situation.
-

Parameters

+

Parameters

@@ -162,7 +162,7 @@
-

Returns

+

Returns

A list of CoglMaterialLayer's that can be passed to the cogl_material_layer_* functions. The list is owned by Cogl and it @@ -176,6 +176,6 @@

-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Materials.html cogl-1.22.2/doc/reference/cogl/html/cogl-Materials.html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Materials.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Materials.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -200,10 +200,6 @@ -#define -COGL_BLEND_STRING_ERROR - - CoglBool @@ -451,6 +447,10 @@ CoglMaterialAlphaFunc +#define +COGL_BLEND_STRING_ERROR + + enum CoglBlendStringError @@ -489,7 +489,7 @@ iterating all the layers of a material .

-

Parameters

+

Parameters

@@ -542,7 +542,7 @@

Allocates and initializes a blank white material

-

Returns

+

Returns

a pointer to a new CoglMaterial

@@ -563,7 +563,7 @@ keep track of a materials ancestry which we may use to help minimize GPU state changes.

-

Parameters

+

Parameters

@@ -578,7 +578,7 @@
-

Returns

+

Returns

a pointer to the newly allocated CoglMaterial

Since: 1.2

@@ -594,7 +594,7 @@

Gets whether the given handle references an existing material object.

-

Parameters

+

Parameters

@@ -609,7 +609,7 @@
-

Returns

+

Returns

TRUE if the handle references a CoglMaterial, FALSE otherwise

@@ -631,7 +631,7 @@ semi-transparent red. See cogl_color_premultiply().

The default value is (1.0, 1.0, 1.0, 1.0)

-

Parameters

+

Parameters

@@ -670,7 +670,7 @@

Sets the basic color of the material, used when no lighting is enabled.

The default value is (0xff, 0xff, 0xff, 0xff)

-

Parameters

+

Parameters

@@ -724,7 +724,7 @@

Sets the basic color of the material, used when no lighting is enabled.

The default value is (1.0, 1.0, 1.0, 1.0)

-

Parameters

+

Parameters

@@ -774,7 +774,7 @@

Retrieves the current material color.

-

Parameters

+

Parameters

@@ -814,7 +814,7 @@ slant.

The default value is (0.2, 0.2, 0.2, 1.0)

-

Parameters

+

Parameters

@@ -850,7 +850,7 @@

Retrieves the current ambient color for material

-

Parameters

+

Parameters

@@ -888,7 +888,7 @@ surface directly - perpendicular to the surface.

The default value is (0.8, 0.8, 0.8, 1.0)

-

Parameters

+

Parameters

@@ -924,7 +924,7 @@

Retrieves the current diffuse color for material

-

Parameters

+

Parameters

@@ -963,7 +963,7 @@

The default ambient color is (0.2, 0.2, 0.2, 1.0)

The default diffuse color is (0.8, 0.8, 0.8, 1.0)

-

Parameters

+

Parameters

@@ -1001,7 +1001,7 @@ color.

The default value is (0.0, 0.0, 0.0, 1.0)

-

Parameters

+

Parameters

@@ -1036,7 +1036,7 @@

Retrieves the materials current emission color.

-

Parameters

+

Parameters

@@ -1074,7 +1074,7 @@ position, and is brightest along the lines of reflection.

The default value is (0.0, 0.0, 0.0, 1.0)

-

Parameters

+

Parameters

@@ -1109,7 +1109,7 @@

Retrieves the materials current specular color.

-

Parameters

+

Parameters

@@ -1149,7 +1149,7 @@ object appear more shiny.

The default value is 0.0

-

Parameters

+

Parameters

@@ -1183,7 +1183,7 @@

Retrieves the materials current emission color.

-

Parameters

+

Parameters

@@ -1198,7 +1198,7 @@
-

Returns

+

Returns

The materials current shininess value

Since: 1.0

@@ -1221,7 +1221,7 @@ and which continue on to the blending stage.

The default is COGL_MATERIAL_ALPHA_FUNC_ALWAYS

-

Parameters

+

Parameters

@@ -1253,14 +1253,6 @@
-

COGL_BLEND_STRING_ERROR

-
#define COGL_BLEND_STRING_ERROR (cogl_blend_string_error_quark ())
-
-

CoglError domain for blend string parser errors

-

Since: 1.0

-
-
-

cogl_material_set_blend ()

CoglBool
 cogl_material_set_blend (CoglMaterial *material,
@@ -1345,7 +1337,7 @@
 
That gives normal alpha-blending when the calculated color for the material
 is in premultiplied form.

 

-
Parameters

+
Parameters
@@ -1378,7 +1370,7 @@
-

Returns

+

Returns

TRUE if the blend string was successfully parsed, and the described blending is supported by the underlying driver/hardware. If there was an error, FALSE is returned and error @@ -1400,7 +1392,7 @@

When blending is setup to reference a CONSTANT blend factor then blending will depend on the constant set with this function.

-

Parameters

+

Parameters

@@ -1441,7 +1433,7 @@ screen space so it will be the same regardless of any transformations. The default point size is 1.0.

-

Parameters

+

Parameters

@@ -1476,7 +1468,7 @@

Get the size of points drawn when COGL_VERTICES_MODE_POINTS is used with the vertex buffer API.

-

Parameters

+

Parameters

@@ -1491,7 +1483,7 @@
-

Returns

+

Returns

the point size of the material.

Since: 1.4

@@ -1516,7 +1508,7 @@
In the future, we may define other types of material layers, such as purely GLSL based layers.
-

Parameters

+

Parameters

@@ -1556,7 +1548,7 @@

This function removes a layer from your material

-

Parameters

+

Parameters

@@ -1683,7 +1675,7 @@
You can't give a multiplication factor for arguments as you can with blending.
-

Parameters

+

Parameters

@@ -1718,7 +1710,7 @@
-

Returns

+

Returns

TRUE if the blend string was successfully parsed, and the described texture combining is supported by the underlying driver and or hardware. On failure, FALSE is returned and error @@ -1742,7 +1734,7 @@

When you are using the 'CONSTANT' color source in a layer combine description then you can use this function to define its value.

-

Parameters

+

Parameters

@@ -1785,7 +1777,7 @@

This function lets you set a matrix that can be used to e.g. translate and rotate a single layer of a material used to fill your geometry.

-

Parameters

+

Parameters

@@ -1840,7 +1832,7 @@ return FALSE and set error .

-

Parameters

+

Parameters

@@ -1872,7 +1864,7 @@
-

Returns

+

Returns

TRUE if the function succeeds, FALSE otherwise.

Since: 1.4

@@ -1892,7 +1884,7 @@

Gets whether point sprite coordinate generation is enabled for this texture layer.

-

Parameters

+

Parameters

@@ -1914,7 +1906,7 @@
-

Returns

+

Returns

whether the texture coordinates will be replaced with point sprite coordinates.

@@ -1932,7 +1924,7 @@

Retrieves the number of layers defined for the given material

-

Parameters

+

Parameters

@@ -1947,7 +1939,7 @@
-

Returns

+

Returns

the number of layers

Since: 1.0

@@ -1967,7 +1959,7 @@

Changes the decimation and interpolation filters used when a texture is drawn at other scales than 100%.

-

Parameters

+

Parameters

@@ -2014,7 +2006,7 @@ based layers in the future, you should write code that checks the type first.

-

Parameters

+

Parameters

@@ -2029,7 +2021,7 @@
-

Returns

+

Returns

the type of the layer

@@ -2049,7 +2041,7 @@ should call cogl_material_layer_get_type() first in order check it is of type COGL_MATERIAL_LAYER_TYPE_TEXTURE before calling this function.
-

Parameters

+

Parameters

@@ -2064,7 +2056,7 @@
-

Returns

+

Returns

a CoglHandle for the texture inside the layer.

[transfer none]

@@ -2080,7 +2072,7 @@

Queries the currently set downscaling filter for a material layer

-

Parameters

+

Parameters

@@ -2095,7 +2087,7 @@
-

Returns

+

Returns

the current downscaling filter

@@ -2110,7 +2102,7 @@

Queries the currently set downscaling filter for a material later

-

Parameters

+

Parameters

@@ -2125,7 +2117,7 @@
-

Returns

+

Returns

the current downscaling filter

@@ -2146,7 +2138,7 @@ cogl_material_set_layer_wrap_mode_t() and cogl_material_set_layer_wrap_mode_p() separately.

-

Parameters

+

Parameters

@@ -2187,7 +2179,7 @@

Sets the wrap mode for the 's' coordinate of texture lookups on this layer.

-

Parameters

+

Parameters

@@ -2228,7 +2220,7 @@

Sets the wrap mode for the 't' coordinate of texture lookups on this layer.

-

Parameters

+

Parameters

@@ -2270,7 +2262,7 @@

Sets the wrap mode for the 'p' coordinate of texture lookups on this layer. 'p' is the third coordinate.

-

Parameters

+

Parameters

@@ -2311,7 +2303,7 @@

Returns the wrap mode for the 's' coordinate of texture lookups on this layer.

-

Parameters

+

Parameters

@@ -2333,7 +2325,7 @@
-

Returns

+

Returns

the wrap mode for the 's' coordinate of texture lookups on this layer.

@@ -2352,7 +2344,7 @@

Returns the wrap mode for the 't' coordinate of texture lookups on this layer.

-

Parameters

+

Parameters

@@ -2374,7 +2366,7 @@
-

Returns

+

Returns

the wrap mode for the 't' coordinate of texture lookups on this layer.

@@ -2393,7 +2385,7 @@

Returns the wrap mode for the 'p' coordinate of texture lookups on this layer.

-

Parameters

+

Parameters

@@ -2415,7 +2407,7 @@
-

Returns

+

Returns

the wrap mode for the 'p' coordinate of texture lookups on this layer.

@@ -2501,7 +2493,7 @@ COGL_FEATURE_SHADERS_GLSL or COGL_FEATURE_SHADERS_ARBFP before using the cogl_program or cogl_shader API.

-

Parameters

+

Parameters

@@ -2537,7 +2529,7 @@ material using cogl_material_set_user_program().

-

Parameters

+

Parameters

@@ -2552,7 +2544,7 @@
-

Returns

+

Returns

The current user program or COGL_INVALID_HANDLE.

[transfer none]

@@ -2573,7 +2565,7 @@

Iterates all the layer indices of the given material .

-

Parameters

+

Parameters

@@ -2636,7 +2628,7 @@ incoming alpha value and a reference alpha value. The CoglMaterialAlphaFunc determines how the comparison is done.

-

Members

+

Members

@@ -2712,10 +2704,18 @@
+

COGL_BLEND_STRING_ERROR

+
#define COGL_BLEND_STRING_ERROR (cogl_blend_string_error_quark ())
+
+

CoglError domain for blend string parser errors

+

Since: 1.0

+
+
+

enum CoglBlendStringError

Error enumeration for the blend strings parser

-

Members

+

Members

@@ -2766,7 +2766,7 @@ possibly referring to multiple neighbouring texels and taking a weighted average or simply using the nearest texel.

-

Members

+

Members

@@ -2838,7 +2838,7 @@

Available types of layers for a CoglMaterial. This enumeration might be expanded in later versions.

-

Members

+

Members

@@ -2869,7 +2869,7 @@ artifacts around the edges when the pixels from the other side are merged in if the wrap mode is set to repeat.

-

Members

+

Members

@@ -2917,6 +2917,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Matrices.html cogl-1.22.2/doc/reference/cogl/html/cogl-Matrices.html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Matrices.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Matrices.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -238,7 +238,7 @@

-

Parameters

+

Parameters

@@ -262,7 +262,7 @@ the same values as matrix .

-

Parameters

+

Parameters

@@ -277,7 +277,7 @@
-

Returns

+

Returns

A newly allocated CoglMatrix which should be freed using cogl_matrix_free().

[transfer full]

@@ -295,7 +295,7 @@ annotations associated with them and may potentially have a cached inverse matrix these are not considered in the comparison.

-

Parameters

+

Parameters

@@ -326,7 +326,7 @@

Frees a CoglMatrix that was previously allocated via a call to cogl_matrix_copy().

-

Parameters

+

Parameters

@@ -356,7 +356,7 @@

Multiplies matrix by the given frustum perspective matrix.

-

Parameters

+

Parameters

@@ -425,7 +425,7 @@

Multiplies matrix by a parallel projection matrix.

-

Parameters

+

Parameters

@@ -492,7 +492,7 @@ since there wont be enough precision to identify the depth of objects near to each other.
-

Parameters

+

Parameters

@@ -543,7 +543,7 @@
It is possible to multiply the a matrix in-place, so result can be equal to a but can't be equal to b.
-

Parameters

+

Parameters

@@ -584,7 +584,7 @@ of angle degrees around the specified 3D vector.

-

Parameters

+

Parameters

@@ -633,7 +633,7 @@ with a transform matrix that translates along the X, Y and Z axis.

-

Parameters

+

Parameters

@@ -677,7 +677,7 @@ with a transform matrix that scales along the X, Y and Z axis.

-

Parameters

+

Parameters

@@ -718,7 +718,7 @@ with its transpose. Ie, every element (i,j) in the new matrix is taken from element (j,i) in the old matrix.

-

Parameters

+

Parameters

@@ -744,7 +744,7 @@ with the contents of array

-

Parameters

+

Parameters

@@ -774,7 +774,7 @@

Casts matrix to a float array which can be directly passed to OpenGL.

-

Parameters

+

Parameters

@@ -789,7 +789,7 @@
-

Returns

+

Returns

a pointer to the float array

@@ -807,7 +807,7 @@ CoglMatrix so that subsequent requests for the inverse transform may avoid costly inversion calculations.
-

Parameters

+

Parameters

@@ -829,7 +829,7 @@
-

Returns

+

Returns

TRUE if the inverse was successfully calculated or FALSE for degenerate transformations that can't be inverted (in this case the inverse @@ -849,7 +849,7 @@

Transforms a point whos position is given and returned as four float components.

-

Parameters

+

Parameters

@@ -960,7 +960,7 @@

-

Parameters

+

Parameters

@@ -1098,7 +1098,7 @@

-

Parameters

+

Parameters

@@ -1167,7 +1167,7 @@ cogl_matrix_is_identity (const CoglMatrix *matrix);

Determines if the given matrix is an identity matrix.

-

Parameters

+

Parameters

@@ -1182,7 +1182,7 @@
-

Returns

+

Returns

TRUE if matrix is an identity matrix else FALSE

@@ -1254,6 +1254,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Offscreen-Buffers-(Deprecated).html cogl-1.22.2/doc/reference/cogl/html/cogl-Offscreen-Buffers-(Deprecated).html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Offscreen-Buffers-(Deprecated).html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Offscreen-Buffers-(Deprecated).html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -74,7 +74,7 @@

Increments the reference count on the offscreen framebuffer.

-

Parameters

+

Parameters

@@ -89,7 +89,7 @@
-

Returns

+

Returns

For convenience it returns the given offscreen .

@@ -109,7 +109,7 @@ buffer and frees it when the count reaches 0.

-

Parameters

+

Parameters

@@ -130,6 +130,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Offscreen-Buffers.html cogl-1.22.2/doc/reference/cogl/html/cogl-Offscreen-Buffers.html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Offscreen-Buffers.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Offscreen-Buffers.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -150,7 +150,7 @@ finished configuring it by calling cogl_framebuffer_allocate() and passing in a CoglError argument to catch any exceptions.

-

Parameters

+

Parameters

@@ -165,7 +165,7 @@
-

Returns

+

Returns

a newly instantiated CoglOffscreen framebuffer.

[transfer full]

@@ -193,7 +193,7 @@ CoglTexture2D, CoglTexture3D and CoglTextureRectangle, and not with meta-texture types such as CoglTexture2DSliced.
-

Parameters

+

Parameters

@@ -208,7 +208,7 @@
-

Returns

+

Returns

a newly instantiated CoglOffscreen framebuffer or NULL if it wasn't possible to create the buffer.

@@ -223,7 +223,7 @@

Determines whether the given CoglObject references an offscreen framebuffer object.

-

Parameters

+

Parameters

@@ -238,7 +238,7 @@
-

Returns

+

Returns

TRUE if object is a CoglOffscreen framebuffer, FALSE otherwise

@@ -259,7 +259,7 @@ either be an offscreen buffer created with cogl_offscreen_new_to_texture() or in the future it may be an onscreen framebuffers too.

-

Parameters

+

Parameters

@@ -404,7 +404,7 @@

The previous framebuffer can be restored by calling cogl_pop_framebuffer()

-

Parameters

+

Parameters

@@ -452,7 +452,7 @@ cogl_offscreen_new_to_texture() or you can revert to your original on screen window buffer.

-

Parameters

+

Parameters

@@ -508,6 +508,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Path-Primitives.html cogl-1.22.2/doc/reference/cogl/html/cogl-Path-Primitives.html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Path-Primitives.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Path-Primitives.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -43,6 +43,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Primitives.html cogl-1.22.2/doc/reference/cogl/html/cogl-Primitives.html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Primitives.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Primitives.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -107,7 +107,7 @@ float y_2);

Fills a rectangle at the given coordinates with the current source material

-

Parameters

+

Parameters

@@ -156,7 +156,7 @@ parameters x1, y1, x2, and y2, and have the same meaning as in cogl_rectangle().

-

Parameters

+

Parameters

@@ -199,7 +199,7 @@ =1.0 ty2 =1.0.

-

Parameters

+

Parameters

@@ -269,7 +269,7 @@ parameters x1, y1, x2, y2, tx1, ty1, tx2 and ty2 and have the same meaning as in cogl_rectangle_with_texture_coords().

-

Parameters

+

Parameters

@@ -312,7 +312,7 @@ layers in the current source material then default texture coordinates (0.0, 0.0, 1.0, 1.0) are generated.

-

Parameters

+

Parameters

@@ -382,7 +382,7 @@ OpenGL ES and the minifying and magnifying functions are both set to COGL_MATERIAL_FILTER_NEAREST.

-

Parameters

+

Parameters

@@ -416,6 +416,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Quaternions-(Rotations).html cogl-1.22.2/doc/reference/cogl/html/cogl-Quaternions-(Rotations).html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Quaternions-(Rotations).html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Quaternions-(Rotations).html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -253,7 +253,7 @@

You might also want to consider using cogl_get_static_identity_quaternion().

-

Parameters

+

Parameters

@@ -286,7 +286,7 @@ ). The axis vector does not need to be normalized.

-

Parameters

+

Parameters

@@ -326,7 +326,7 @@
-

Returns

+

Returns

A normalized, unit quaternion representing an orientation rotated angle degrees around the axis vector (x @@ -350,7 +350,7 @@ vector. The axis vector does not need to be normalized.

-

Parameters

+

Parameters

@@ -378,7 +378,7 @@
-

Returns

+

Returns

A normalized, unit quaternion representing an orientation rotated angle degrees around the given axis @@ -395,7 +395,7 @@

Initializes a [w (x, y,z)] quaternion directly from an array of 4 floats: [w,x,y,z].

-

Parameters

+

Parameters

@@ -426,7 +426,7 @@ float angle);

XXX: check which direction this rotates

-

Parameters

+

Parameters

@@ -456,7 +456,7 @@ cogl_quaternion_init_from_y_rotation (CoglQuaternion *quaternion, float angle);
-

Parameters

+

Parameters

@@ -486,7 +486,7 @@ cogl_quaternion_init_from_z_rotation (CoglQuaternion *quaternion, float angle);
-

Parameters

+

Parameters

@@ -523,7 +523,7 @@ the == operator is at least used so that 0 and -0 are considered equal.

-

Parameters

+

Parameters

@@ -545,7 +545,7 @@
-

Returns

+

Returns

TRUE if the quaternions are equal else FALSE.

Since: 2.0

@@ -559,7 +559,7 @@ the same values as src .

-

Parameters

+

Parameters

@@ -574,7 +574,7 @@
-

Returns

+

Returns

A newly allocated CoglQuaternion which should be freed using cogl_quaternion_free()

@@ -588,7 +588,7 @@

Frees a CoglQuaternion that was previously allocated via cogl_quaternion_copy().

-

Parameters

+

Parameters

@@ -610,7 +610,7 @@ 
float
 cogl_quaternion_get_rotation_angle (const CoglQuaternion *quaternion);
-

Parameters

+

Parameters

@@ -633,7 +633,7 @@ cogl_quaternion_get_rotation_axis (const CoglQuaternion *quaternion, float *vector3);
-

Parameters

+

Parameters

@@ -662,7 +662,7 @@ 
void
 cogl_quaternion_normalize (CoglQuaternion *quaternion);
-

Parameters

+

Parameters

@@ -685,7 +685,7 @@ cogl_quaternion_dot_product (const CoglQuaternion *a, const CoglQuaternion *b);
-

Parameters

+

Parameters

@@ -714,7 +714,7 @@ 
void
 cogl_quaternion_invert (CoglQuaternion *quaternion);
-

Parameters

+

Parameters

@@ -748,7 +748,7 @@
It is possible to multiply the a quaternion in-place, so result can be equal to a but can't be equal to b.
-

Parameters

+

Parameters

@@ -783,7 +783,7 @@ cogl_quaternion_pow (CoglQuaternion *quaternion, float exponent);
-

Parameters

+

Parameters

@@ -831,7 +831,7 @@
-

Parameters

+

Parameters

@@ -900,7 +900,7 @@
-

Parameters

+

Parameters

@@ -946,7 +946,7 @@ const CoglQuaternion *next, float t);
-

Parameters

+

Parameters

@@ -1004,7 +1004,7 @@

If you multiply a quaternion with the identity quaternion you will get back the same value as the original quaternion.

-

Returns

+

Returns

A pointer to an identity quaternion

Since: 2.0

@@ -1015,7 +1015,7 @@ 
const CoglQuaternion *
 cogl_get_static_zero_quaternion (void);
-

Returns

+

Returns

a pointer to a singleton quaternion constant describing a rotation of 180 degrees around a degenerate axis: [0 (0, 0, 0)]

@@ -1101,7 +1101,7 @@
  • http://www.j3d.org/matrix_faq/matrfaq_latest.html#Q56
    • -

    Members

    +

    Members

    @@ -1139,6 +1139,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline-(Deprecated).html cogl-1.22.2/doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline-(Deprecated).html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline-(Deprecated).html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline-(Deprecated).html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -137,7 +137,7 @@

    Add an extra reference to a shader.

    -

    Parameters

    +

    Parameters

    @@ -152,7 +152,7 @@
    -

    Returns

    +

    Returns

    handle

    @@ -169,7 +169,7 @@

    Removes a reference to a shader. If it was the last reference the shader object will be destroyed.

    -

    Parameters

    +

    Parameters

    @@ -195,7 +195,7 @@

    Add an extra reference to a program.

    -

    Parameters

    +

    Parameters

    @@ -210,7 +210,7 @@
    -

    Returns

    +

    Returns

    handle

    @@ -227,7 +227,7 @@

    Removes a reference to a program. If it was the last reference the program object will be destroyed.

    -

    Parameters

    +

    Parameters

    @@ -259,7 +259,7 @@ specific material used for rendering instead by calling cogl_material_set_user_program().

    -

    Parameters

    +

    Parameters

    @@ -287,7 +287,7 @@

    Changes the value of a floating point uniform in the currently used (see cogl_program_use()) shader program.

    -

    Parameters

    +

    Parameters

    @@ -322,7 +322,7 @@

    Changes the value of an integer uniform in the currently used (see cogl_program_use()) shader program.

    -

    Parameters

    +

    Parameters

    @@ -359,7 +359,7 @@

    Changes the value of a float vector uniform, or uniform array in the currently used (see cogl_program_use()) shader program.

    -

    Parameters

    +

    Parameters

    @@ -406,7 +406,7 @@

    Changes the value of a int vector uniform, or uniform array in the currently used (see cogl_program_use()) shader program.

    -

    Parameters

    +

    Parameters

    @@ -456,7 +456,7 @@ parameter is used to determine the square size of the matrix.

    -

    Parameters

    +

    Parameters

    @@ -499,6 +499,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline.html cogl-1.22.2/doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline.html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -334,7 +334,7 @@

    Create a new shader handle, use cogl_shader_source() to set the source code to be used on it.

    -

    Parameters

    +

    Parameters

    @@ -349,7 +349,7 @@
    -

    Returns

    +

    Returns

    a new shader handle.

    @@ -364,7 +364,7 @@

    Gets whether the given handle references an existing shader object.

    -

    Parameters

    +

    Parameters

    @@ -379,7 +379,7 @@
    -

    Returns

    +

    Returns

    TRUE if the handle references a shader, FALSE otherwise

    @@ -399,7 +399,7 @@

    Please see above for a description of the recommended format for the shader code.

    -

    Parameters

    +

    Parameters

    @@ -435,7 +435,7 @@ optional. If it is not called then the shader will be automatically compiled when it is linked.

    -

    Parameters

    +

    Parameters

    @@ -464,7 +464,7 @@ messages that caused a shader to not compile correctly, mainly useful for debugging purposes.

    -

    Parameters

    +

    Parameters

    @@ -479,7 +479,7 @@
    -

    Returns

    +

    Returns

    a newly allocated string containing the info log. Use g_free() to free it

    @@ -495,7 +495,7 @@

    Retrieves the type of a shader CoglHandle

    -

    Parameters

    +

    Parameters

    @@ -510,7 +510,7 @@
    -

    Returns

    +

    Returns

    COGL_SHADER_TYPE_VERTEX if the shader is a vertex processor or COGL_SHADER_TYPE_FRAGMENT if the shader is a frament processor

    @@ -526,7 +526,7 @@

    Retrieves whether a shader CoglHandle has been compiled

    -

    Parameters

    +

    Parameters

    @@ -541,7 +541,7 @@
    -

    Returns

    +

    Returns

    TRUE if the shader object has sucessfully be compiled

    @@ -557,7 +557,7 @@

    Create a new cogl program object that can be used to replace parts of the GL rendering pipeline with custom code.

    -

    Returns

    +

    Returns

    a new cogl program.

    @@ -572,7 +572,7 @@

    Gets whether the given handle references an existing program object.

    -

    Parameters

    +

    Parameters

    @@ -587,7 +587,7 @@
    -

    Returns

    +

    Returns

    TRUE if the handle references a program, FALSE otherwise

    @@ -607,7 +607,7 @@ main() function. It is allowed to use a program with only a vertex shader or only a fragment shader.

    -

    Parameters

    +

    Parameters

    @@ -642,7 +642,7 @@ function is optional. If it is not called the program will automatically be linked the first time it is used.

    -

    Parameters

    +

    Parameters

    @@ -671,7 +671,7 @@ a uniform is a variable that is constant for all vertices/fragments for a shader object and is possible to modify as an external parameter.

    -

    Parameters

    +

    Parameters

    @@ -693,7 +693,7 @@
    -

    Returns

    +

    Returns

    the offset of a uniform in a specified program. This uniform can be set using cogl_program_uniform_1f() when the program is in use.

    @@ -714,7 +714,7 @@ program .

    -

    Parameters

    +

    Parameters

    @@ -758,7 +758,7 @@ program .

    -

    Parameters

    +

    Parameters

    @@ -804,7 +804,7 @@ the given linked program .

    -

    Parameters

    +

    Parameters

    @@ -862,7 +862,7 @@ the given linked program .

    -

    Parameters

    +

    Parameters

    @@ -921,7 +921,7 @@ given linked program .

    -

    Parameters

    +

    Parameters

    @@ -974,7 +974,7 @@

    enum CoglShaderType

    Types of shaders

    -

    Members

    +

    Members

    @@ -1004,6 +1004,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Textures-(Deprecated).html cogl-1.22.2/doc/reference/cogl/html/cogl-Textures-(Deprecated).html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Textures-(Deprecated).html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Textures-(Deprecated).html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -74,7 +74,7 @@

    Increment the reference count for a cogl texture.

    [skip]

    -

    Parameters

    +

    Parameters

    @@ -89,7 +89,7 @@
    -

    Returns

    +

    Returns

    the texture pointer.

    @@ -106,7 +106,7 @@

    Decrement the reference count for a cogl texture.

    [skip]

    -

    Parameters

    +

    Parameters

    @@ -127,6 +127,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Textures.html cogl-1.22.2/doc/reference/cogl/html/cogl-Textures.html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Textures.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Textures.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -208,7 +208,7 @@

    Creates a new CoglTexture with the specified dimensions and pixel format.

    -

    Parameters

    +

    Parameters

    @@ -241,7 +241,7 @@
    -

    Returns

    +

    Returns

    A newly created CoglTexture or NULL on failure.

    [transfer full]

    @@ -262,7 +262,7 @@

    Creates a CoglTexture from an image file.

    -

    Parameters

    +

    Parameters

    @@ -301,7 +301,7 @@
    -

    Returns

    +

    Returns

    A newly created CoglTexture or NULL on failure.

    [transfer full]

    @@ -326,7 +326,7 @@

    Creates a new CoglTexture based on data residing in memory.

    -

    Parameters

    +

    Parameters

    @@ -382,7 +382,7 @@
    -

    Returns

    +

    Returns

    A newly created CoglTexture or NULL on failure.

    [transfer full]

    @@ -415,7 +415,7 @@ the waste arguments to tell Cogl which region should be mapped to the texture coordinate range [0:1].

    -

    Parameters

    +

    Parameters

    @@ -462,7 +462,7 @@
    -

    Returns

    +

    Returns

    A newly created CoglTexture or NULL on failure.

    [transfer full]

    @@ -483,7 +483,7 @@

    Creates a CoglTexture from a CoglBitmap.

    -

    Parameters

    +

    Parameters

    @@ -511,7 +511,7 @@
    -

    Returns

    +

    Returns

    A newly created CoglTexture or NULL on failure.

    [transfer full]

    @@ -541,7 +541,7 @@ not need to keep one separately if you only want to use the sub texture.

    -

    Parameters

    +

    Parameters

    @@ -578,7 +578,7 @@
    -

    Returns

    +

    Returns

    A newly created CoglTexture or NULL on failure.

    [transfer full]

    @@ -592,7 +592,7 @@ cogl_is_texture (void *object);

    Gets whether the given object references a texture object.

    -

    Parameters

    +

    Parameters

    @@ -607,7 +607,7 @@
    -

    Returns

    +

    Returns

    TRUE if the object references a texture, and FALSE otherwise

    @@ -620,7 +620,7 @@ cogl_texture_get_width (CoglTexture *texture);

    Queries the width of a cogl texture.

    -

    Parameters

    +

    Parameters

    @@ -635,7 +635,7 @@
    -

    Returns

    +

    Returns

    the width of the GPU side texture in pixels

    @@ -646,7 +646,7 @@ cogl_texture_get_height (CoglTexture *texture);

    Queries the height of a cogl texture.

    -

    Parameters

    +

    Parameters

    @@ -661,7 +661,7 @@
    -

    Returns

    +

    Returns

    the height of the GPU side texture in pixels

    @@ -676,7 +676,7 @@

    Queries the CoglPixelFormat of a cogl texture.

    -

    Parameters

    +

    Parameters

    @@ -691,7 +691,7 @@
    -

    Returns

    +

    Returns

    the CoglPixelFormat of the GPU side texture

    @@ -721,7 +721,7 @@ for your destination buffer not the rowstride of the source texture.
    -

    Returns

    +

    Returns

    The bytes-per-pixel for the current format multiplied by the texture's width

    @@ -734,7 +734,7 @@

    Queries the maximum wasted (unused) pixels in one dimension of a GPU side texture.

    -

    Parameters

    +

    Parameters

    @@ -749,7 +749,7 @@
    -

    Returns

    +

    Returns

    the maximum waste

    @@ -761,7 +761,7 @@

    Queries if a texture is sliced (stored as multiple GPU side tecture objects).

    -

    Parameters

    +

    Parameters

    @@ -776,7 +776,7 @@
    -

    Returns

    +

    Returns

    TRUE if the texture is sliced, FALSE if the texture is stored as a single GPU texture

    @@ -792,7 +792,7 @@

    If the texture is spliced the data for the first sub texture will be queried.

    -

    Parameters

    +

    Parameters

    @@ -821,7 +821,7 @@
    -

    Returns

    +

    Returns

    TRUE if the handle was successfully retrieved, FALSE if the handle was invalid

    @@ -840,7 +840,7 @@ want for the destination data buffer not the rowstride of the source texture
    -

    Parameters

    +

    Parameters

    @@ -879,7 +879,7 @@
    -

    Returns

    +

    Returns

    the size of the texture data in bytes

    @@ -905,7 +905,7 @@
    The region set can't be larger than the source data
    -

    Parameters

    +

    Parameters

    @@ -982,7 +982,7 @@
    -

    Returns

    +

    Returns

    TRUE if the subregion upload was successful, and FALSE otherwise

    @@ -1001,7 +1001,7 @@

    Used to specify vertex information when calling cogl_polygon()

    -

    Members

    +

    Members

    @@ -1049,7 +1049,7 @@

    enum CoglTextureFlags

    Flags to pass to the cogl_texture_new_* family of functions.

    -

    Members

    +

    Members

    @@ -1098,6 +1098,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Vectors.html cogl-1.22.2/doc/reference/cogl/html/cogl-Vectors.html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Vectors.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Vectors.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -189,7 +189,7 @@ then be manipulated with the cogl_vector convenience APIs. Vectors can also be used in places where a "point" is often desired.

    -

    Parameters

    +

    Parameters

    @@ -244,7 +244,7 @@

    Initializes a 3 component, single precision float vector with zero for each component.

    -

    Parameters

    +

    Parameters

    @@ -288,7 +288,7 @@ essentially identical except for some minor precision error differences due to the way they have been manipulated.

    -

    Parameters

    +

    Parameters

    @@ -310,7 +310,7 @@
    -

    Returns

    +

    Returns

    TRUE if the vectors are equal else FALSE.

    Since: 1.4

    @@ -353,7 +353,7 @@

    -

    Parameters

    +

    Parameters

    @@ -381,7 +381,7 @@
    -

    Returns

    +

    Returns

    TRUE if the vectors are equal else FALSE.

    Since: 1.4

    @@ -411,7 +411,7 @@ newly allocated vector. You should free the memory using cogl_vector3_free()

    -

    Parameters

    +

    Parameters

    @@ -426,7 +426,7 @@
    -

    Returns

    +

    Returns

    A newly allocated 3 component float vector

    Since: 1.4

    @@ -453,7 +453,7 @@

    Frees a 3 component vector that was previously allocated with cogl_vector3_copy()

    -

    Parameters

    +

    Parameters

    @@ -491,7 +491,7 @@

    Inverts/negates all the components of the given vector .

    -

    Parameters

    +

    Parameters

    @@ -534,7 +534,7 @@ storing the results in result .

    -

    Parameters

    +

    Parameters

    @@ -589,7 +589,7 @@ storing the results in result .

    -

    Parameters

    +

    Parameters

    @@ -640,7 +640,7 @@

    Multiplies each of the vector components by the given scalar.

    -

    Parameters

    +

    Parameters

    @@ -686,7 +686,7 @@

    Divides each of the vector components by the given scalar.

    -

    Parameters

    +

    Parameters

    @@ -735,7 +735,7 @@ try to divide components by 0 (its norm) and will leave the vector untouched.
    -

    Parameters

    +

    Parameters

    @@ -773,7 +773,7 @@

    Calculates the scalar magnitude or length of vector .

    -

    Parameters

    +

    Parameters

    @@ -788,7 +788,7 @@
    -

    Returns

    +

    Returns

    The magnitude of vector .

    @@ -834,7 +834,7 @@ then the resulting vector points along your extended thumb.

    -

    Parameters

    +

    Parameters

    @@ -861,7 +861,7 @@
    -

    Returns

    +

    Returns

    The cross product between two vectors u and v .

    @@ -930,7 +930,7 @@

    -

    Parameters

    +

    Parameters

    @@ -952,7 +952,7 @@
    -

    Returns

    +

    Returns

    The dot product of two vectors.

    Since: 1.4

    @@ -980,7 +980,7 @@

    If you consider the two given vectors as (x,y,z) points instead then this will compute the distance between those two points.

    -

    Parameters

    +

    Parameters

    @@ -1002,7 +1002,7 @@
    -

    Returns

    +

    Returns

    The distance between two points given as 3 component vectors.

    @@ -1028,6 +1028,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Vertex-Buffers-(Deprecated).html cogl-1.22.2/doc/reference/cogl/html/cogl-Vertex-Buffers-(Deprecated).html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Vertex-Buffers-(Deprecated).html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Vertex-Buffers-(Deprecated).html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -73,7 +73,7 @@

    Increment the reference count for a vertex buffer

    -

    Parameters

    +

    Parameters

    @@ -89,7 +89,7 @@
    -

    Returns

    +

    Returns

    the handle .

    @@ -105,7 +105,7 @@

    Decrement the reference count for a vertex buffer

    -

    Parameters

    +

    Parameters

    @@ -127,6 +127,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/cogl-Vertex-Buffers.html cogl-1.22.2/doc/reference/cogl/html/cogl-Vertex-Buffers.html --- cogl-1.22.0/doc/reference/cogl/html/cogl-Vertex-Buffers.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/cogl-Vertex-Buffers.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -208,7 +208,7 @@

    Creates a new vertex buffer that you can use to add attributes.

    -

    Parameters

    +

    Parameters

    @@ -223,7 +223,7 @@
    -

    Returns

    +

    Returns

    a new CoglHandle

    @@ -239,7 +239,7 @@

    Retrieves the number of vertices that handle represents

    -

    Parameters

    +

    Parameters

    @@ -254,7 +254,7 @@
    -

    Returns

    +

    Returns

    the number of vertices

    @@ -301,7 +301,7 @@ (Though you can have multiple groups of interleved attributes)
    -

    Parameters

    +

    Parameters

    @@ -386,7 +386,7 @@ cogl_vertex_buffer_submit() or issue a draw call to commit this change to the GPU.

    -

    Parameters

    +

    Parameters

    @@ -424,7 +424,7 @@ you are using GLX indirect rendering) and potentially a format conversion cost if the GPU doesn't natively support any of the given attribute formats.

    -

    Parameters

    +

    Parameters

    @@ -456,7 +456,7 @@

    You don't need to call cogl_vertex_buffer_submit() after using this function.

    -

    Parameters

    +

    Parameters

    @@ -494,7 +494,7 @@ attributes before using a buffer for drawing.

    You don't need to call cogl_vertex_buffer_submit() after using this function

    -

    Parameters

    +

    Parameters

    @@ -533,7 +533,7 @@

    Any un-submitted attribute changes are automatically submitted before drawing.

    -

    Parameters

    +

    Parameters

    @@ -578,7 +578,7 @@

    Checks whether handle is a Vertex Buffer Object

    -

    Parameters

    +

    Parameters

    @@ -593,7 +593,7 @@
    -

    Returns

    +

    Returns

    TRUE if the handle is a VBO, and FALSE otherwise

    @@ -615,7 +615,7 @@ array allows you to reference vertices multiple times, for example during triangle strips.

    -

    Parameters

    +

    Parameters

    @@ -644,7 +644,7 @@
    -

    Returns

    +

    Returns

    A CoglHandle for the indices which you can pass to cogl_vertex_buffer_draw_elements().

    @@ -670,7 +670,7 @@

    Any un-submitted attribute changes are automatically submitted before drawing.

    -

    Parameters

    +

    Parameters

    @@ -749,7 +749,7 @@
    Illustration of the triangle indices that will be generated

    -

    Parameters

    +

    Parameters

    @@ -764,7 +764,7 @@
    -

    Returns

    +

    Returns

    A CoglHandle containing the indices. The handled is owned by Cogl and should not be modified or unref'd.

    @@ -782,7 +782,7 @@ is a handle to the indices for a vertex buffer object

    -

    Parameters

    +

    Parameters

    @@ -797,7 +797,7 @@
    -

    Returns

    +

    Returns

    TRUE if the handle is indices, and FALSE otherwise

    @@ -810,7 +810,7 @@

    enum CoglVerticesMode

    Different ways of interpreting vertices when drawing.

    -

    Members

    +

    Members

    @@ -889,7 +889,7 @@ be available if the GL_OES_element_index_uint extension is advertized.

    -

    Members

    +

    Members

    @@ -925,6 +925,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/index.html cogl-1.22.2/doc/reference/cogl/html/index.html --- cogl-1.22.0/doc/reference/cogl/html/index.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/index.html 2016-08-26 17:38:09.000000000 +0000 @@ -6,7 +6,7 @@ - + @@ -14,7 +14,7 @@
    -

    for Cogl 1.22.0

    +

    for Cogl 1.22.2

    Copyright © 2008 OpenedHand LTD

    Copyright © 2009, 2010 Intel Corporation

    @@ -152,6 +152,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25
    \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/ix01.html cogl-1.22.2/doc/reference/cogl/html/ix01.html --- cogl-1.22.0/doc/reference/cogl/html/ix01.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/ix01.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -1712,6 +1712,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/ix02.html cogl-1.22.2/doc/reference/cogl/html/ix02.html --- cogl-1.22.0/doc/reference/cogl/html/ix02.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/ix02.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -712,6 +712,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/ix03.html cogl-1.22.2/doc/reference/cogl/html/ix03.html --- cogl-1.22.0/doc/reference/cogl/html/ix03.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/ix03.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -69,6 +69,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/ix04.html cogl-1.22.2/doc/reference/cogl/html/ix04.html --- cogl-1.22.0/doc/reference/cogl/html/ix04.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/ix04.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -596,6 +596,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/ix05.html cogl-1.22.2/doc/reference/cogl/html/ix05.html --- cogl-1.22.0/doc/reference/cogl/html/ix05.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/ix05.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -119,6 +119,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/ix06.html cogl-1.22.2/doc/reference/cogl/html/ix06.html --- cogl-1.22.0/doc/reference/cogl/html/ix06.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/ix06.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -285,6 +285,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/ix07.html cogl-1.22.2/doc/reference/cogl/html/ix07.html --- cogl-1.22.0/doc/reference/cogl/html/ix07.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/ix07.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -63,6 +63,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/ix08.html cogl-1.22.2/doc/reference/cogl/html/ix08.html --- cogl-1.22.0/doc/reference/cogl/html/ix08.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/ix08.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -29,6 +29,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/html/license.html cogl-1.22.2/doc/reference/cogl/html/license.html --- cogl-1.22.0/doc/reference/cogl/html/license.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/html/license.html 2016-08-26 17:38:09.000000000 +0000 @@ -7,7 +7,7 @@ - + @@ -52,6 +52,6 @@

    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl/Makefile.in cogl-1.22.2/doc/reference/cogl/Makefile.in --- cogl-1.22.0/doc/reference/cogl/Makefile.in 2015-09-16 14:00:52.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl/Makefile.in 2016-08-26 17:33:59.000000000 +0000 @@ -290,6 +290,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -744,11 +745,11 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." +@BUILD_GTK_DOC_FALSE@uninstall-local: @BUILD_GTK_DOC_FALSE@maintainer-clean-local: +@BUILD_GTK_DOC_FALSE@install-data-local: @BUILD_GTK_DOC_FALSE@clean-local: @BUILD_GTK_DOC_FALSE@distclean-local: -@BUILD_GTK_DOC_FALSE@install-data-local: -@BUILD_GTK_DOC_FALSE@uninstall-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml cogl-1.22.2/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml 2015-09-16 14:00:56.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml 2016-08-26 17:35:02.000000000 +0000 @@ -1,7 +1,7 @@ + ]> diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/ch01.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/ch01.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/ch01.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/ch01.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -227,6 +227,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-2D-textures.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-2D-textures.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-2D-textures.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-2D-textures.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -141,7 +141,7 @@ checking for the COGL_FEATURE_ID_TEXTURE_NPOT feature via cogl_has_feature().
    -

    Parameters

    +

    Parameters

    @@ -168,7 +168,7 @@
    -

    Returns

    +

    Returns

    A new CoglTexture2D object with no storage yet allocated.

    [transfer full]

    @@ -196,7 +196,7 @@ checking for the COGL_FEATURE_ID_TEXTURE_NPOT feature via cogl_has_feature().
    -

    Parameters

    +

    Parameters

    @@ -223,7 +223,7 @@
    -

    Returns

    +

    Returns

    A newly created CoglTexture2D or NULL on failure and error will be updated.

    @@ -252,7 +252,7 @@ checking for the COGL_FEATURE_ID_TEXTURE_NPOT feature via cogl_has_feature().
    -

    Parameters

    +

    Parameters

    @@ -267,7 +267,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglTexture2D.

    [transfer full]

    @@ -316,7 +316,7 @@ checking for the COGL_FEATURE_ID_TEXTURE_NPOT feature via cogl_has_feature().
    -

    Parameters

    +

    Parameters

    @@ -369,7 +369,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglTexture2D, or if the size is not supported (because it is too large or a non-power-of-two size that the hardware doesn't support) @@ -398,7 +398,7 @@ or if width or height don't have the correct texture geometry.

    -

    Parameters

    +

    Parameters

    @@ -435,7 +435,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglTexture2D.

    [transfer full]

    @@ -449,7 +449,7 @@

    Gets whether the given object references an existing CoglTextureRectangle object.

    -

    Parameters

    +

    Parameters

    @@ -464,7 +464,7 @@
    -

    Returns

    +

    Returns

    TRUE if the object references a CoglTextureRectangle, FALSE otherwise.

    @@ -479,6 +479,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-3-Component-Vectors.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-3-Component-Vectors.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-3-Component-Vectors.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-3-Component-Vectors.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -189,7 +189,7 @@ then be manipulated with the cogl_vector convenience APIs. Vectors can also be used in places where a "point" is often desired.

    -

    Parameters

    +

    Parameters

    @@ -244,7 +244,7 @@

    Initializes a 3 component, single precision float vector with zero for each component.

    -

    Parameters

    +

    Parameters

    @@ -288,7 +288,7 @@ essentially identical except for some minor precision error differences due to the way they have been manipulated.

    -

    Parameters

    +

    Parameters

    @@ -310,7 +310,7 @@
    -

    Returns

    +

    Returns

    TRUE if the vectors are equal else FALSE.

    Since: 1.4

    @@ -353,7 +353,7 @@

    -

    Parameters

    +

    Parameters

    @@ -381,7 +381,7 @@
    -

    Returns

    +

    Returns

    TRUE if the vectors are equal else FALSE.

    Since: 1.4

    @@ -411,7 +411,7 @@ newly allocated vector. You should free the memory using cogl_vector3_free()

    -

    Parameters

    +

    Parameters

    @@ -426,7 +426,7 @@
    -

    Returns

    +

    Returns

    A newly allocated 3 component float vector

    Since: 1.4

    @@ -453,7 +453,7 @@

    Frees a 3 component vector that was previously allocated with cogl_vector3_copy()

    -

    Parameters

    +

    Parameters

    @@ -491,7 +491,7 @@

    Inverts/negates all the components of the given vector .

    -

    Parameters

    +

    Parameters

    @@ -534,7 +534,7 @@ storing the results in result .

    -

    Parameters

    +

    Parameters

    @@ -589,7 +589,7 @@ storing the results in result .

    -

    Parameters

    +

    Parameters

    @@ -640,7 +640,7 @@

    Multiplies each of the vector components by the given scalar.

    -

    Parameters

    +

    Parameters

    @@ -686,7 +686,7 @@

    Divides each of the vector components by the given scalar.

    -

    Parameters

    +

    Parameters

    @@ -735,7 +735,7 @@ try to divide components by 0 (its norm) and will leave the vector untouched.
    -

    Parameters

    +

    Parameters

    @@ -773,7 +773,7 @@

    Calculates the scalar magnitude or length of vector .

    -

    Parameters

    +

    Parameters

    @@ -788,7 +788,7 @@
    -

    Returns

    +

    Returns

    The magnitude of vector .

    @@ -834,7 +834,7 @@ then the resulting vector points along your extended thumb.

    -

    Parameters

    +

    Parameters

    @@ -861,7 +861,7 @@
    -

    Returns

    +

    Returns

    The cross product between two vectors u and v .

    @@ -930,7 +930,7 @@

    -

    Parameters

    +

    Parameters

    @@ -952,7 +952,7 @@
    -

    Returns

    +

    Returns

    The dot product of two vectors.

    Since: 1.4

    @@ -980,7 +980,7 @@

    If you consider the two given vectors as (x,y,z) points instead then this will compute the distance between those two points.

    -

    Parameters

    +

    Parameters

    @@ -1002,7 +1002,7 @@
    -

    Returns

    +

    Returns

    The distance between two points given as 3 component vectors.

    @@ -1028,6 +1028,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-3D-textures.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-3D-textures.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-3D-textures.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-3D-textures.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -120,7 +120,7 @@ fail if the requested dimensions are not supported by the GPU.
    -

    Parameters

    +

    Parameters

    @@ -152,7 +152,7 @@
    -

    Returns

    +

    Returns

    A new CoglTexture3D object with no storage yet allocated.

    [transfer full]

    @@ -205,7 +205,7 @@ fail if the requested dimensions are not supported by the GPU.
    -

    Parameters

    +

    Parameters

    @@ -232,7 +232,7 @@
    -

    Returns

    +

    Returns

    a newly created CoglTexture3D.

    [transfer full]

    @@ -280,7 +280,7 @@ instead create a CoglBitmap for your data and use cogl_texture_3d_new_from_bitmap().
    -

    Parameters

    +

    Parameters

    @@ -344,7 +344,7 @@
    -

    Returns

    +

    Returns

    the newly created CoglTexture3D or NULL if there was an error and an exception will be returned through error @@ -374,7 +374,7 @@ cogl_is_texture_3d (void *object);

    Checks whether the given object references a CoglTexture3D

    -

    Parameters

    +

    Parameters

    @@ -389,7 +389,7 @@
    -

    Returns

    +

    Returns

    TRUE if the passed object represents a 3D texture and FALSE otherwise

    @@ -419,6 +419,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Bitmap.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Bitmap.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Bitmap.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Bitmap.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -135,10 +135,6 @@ cogl_texture_new_from_bitmap () - -#define -COGL_BITMAP_ERROR - @@ -155,6 +151,10 @@ CoglBitmap +#define +COGL_BITMAP_ERROR + + enum CoglBitmapError @@ -176,7 +176,7 @@

    Checks whether object is a CoglBitmap

    -

    Parameters

    +

    Parameters

    @@ -191,7 +191,7 @@
    -

    Returns

    +

    Returns

    TRUE if the passed object represents a bitmap, and FALSE otherwise

    @@ -207,7 +207,7 @@

    Loads an image file from disk. This function can be safely called from within a thread.

    -

    Parameters

    +

    Parameters

    @@ -229,7 +229,7 @@
    -

    Returns

    +

    Returns

    a CoglBitmap to the new loaded image data, or NULL if loading the image failed.

    [transfer full]

    @@ -249,7 +249,7 @@

    Wraps some image data that has been uploaded into a CoglBuffer as a CoglBitmap. The data is not copied in this process.

    -

    Parameters

    +

    Parameters

    @@ -298,7 +298,7 @@
    -

    Returns

    +

    Returns

    a CoglBitmap encapsulating the given buffer .

    [transfer full]

    @@ -341,7 +341,7 @@ writing into it. The stride can be retrieved with cogl_bitmap_get_rowstride().
    -

    Parameters

    +

    Parameters

    @@ -373,7 +373,7 @@
    -

    Returns

    +

    Returns

    a CoglPixelBuffer representing the newly created array or NULL on failure.

    [transfer full]

    @@ -410,7 +410,7 @@ cogl_framebuffer_read_pixels_into_bitmap() to read data directly into an application buffer with the specified rowstride.

    -

    Parameters

    +

    Parameters

    @@ -453,7 +453,7 @@
    -

    Returns

    +

    Returns

    A new CoglBitmap.

    [transfer full]

    @@ -479,7 +479,7 @@ 
    CoglPixelFormat
 cogl_bitmap_get_format (CoglBitmap *bitmap);
    -

    Parameters

    +

    Parameters

    @@ -494,7 +494,7 @@
    -

    Returns

    +

    Returns

    the CoglPixelFormat that the data for the bitmap is in.

    Since: 1.10

    @@ -519,7 +519,7 @@ 
    int
 cogl_bitmap_get_width (CoglBitmap *bitmap);
    -

    Parameters

    +

    Parameters

    @@ -534,7 +534,7 @@
    -

    Returns

    +

    Returns

    the width of the bitmap

    Since: 1.10

    @@ -559,7 +559,7 @@ 
    int
 cogl_bitmap_get_height (CoglBitmap *bitmap);
    -

    Parameters

    +

    Parameters

    @@ -574,7 +574,7 @@
    -

    Returns

    +

    Returns

    the height of the bitmap

    Since: 1.10

    @@ -599,7 +599,7 @@ 
    int
 cogl_bitmap_get_rowstride (CoglBitmap *bitmap);
    -

    Parameters

    +

    Parameters

    @@ -614,7 +614,7 @@
    -

    Returns

    +

    Returns

    the rowstride of the bitmap. This is the number of bytes between the address of start of one row to the address of the next row in the image.

    @@ -641,7 +641,7 @@ 
    CoglPixelBuffer *
 cogl_bitmap_get_buffer (CoglBitmap *bitmap);
    -

    Parameters

    +

    Parameters

    @@ -656,7 +656,7 @@
    -

    Returns

    +

    Returns

    the CoglPixelBuffer that this buffer uses for storage. Note that if the bitmap was created with cogl_bitmap_new_from_file() then it will not actually be using a @@ -689,7 +689,7 @@

    Parses an image file enough to extract the width and height of the bitmap.

    -

    Parameters

    +

    Parameters

    @@ -716,7 +716,7 @@
    -

    Returns

    +

    Returns

    TRUE if the image was successfully parsed

    Since: 1.0

    @@ -735,7 +735,7 @@

    Creates a CoglTexture from a CoglBitmap.

    -

    Parameters

    +

    Parameters

    @@ -763,13 +763,20 @@
    -

    Returns

    +

    Returns

    A newly created CoglTexture or NULL on failure.

    [transfer full]

    Since: 1.0

    +
    +
    +

    Types and Values

    +
    +

    CoglBitmap

    +
    typedef struct _CoglBitmap CoglBitmap;
    +

    COGL_BITMAP_ERROR

    @@ -778,23 +785,16 @@

    CoglError domain for bitmap errors.

    Since: 1.4

    -
    -
    -

    Types and Values

    -
    -

    CoglBitmap

    -
    typedef struct _CoglBitmap CoglBitmap;
    -

    enum CoglBitmapError

    Error codes that can be thrown when performing bitmap -operations. Note that gdk_pixbuf_new_from_file() can also throw +operations. Note that gdk_pixbuf_new_from_file() can also throw errors directly from the underlying image loading library. For -example, if GdkPixbuf is used then errors GdkPixbufErrors +example, if GdkPixbuf is used then errors GdkPixbufErrors will be used directly.

    -

    Members

    +

    Members

    @@ -832,6 +832,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglAttributeBuffer---Buffers-of-vertex-attributes.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglAttributeBuffer---Buffers-of-vertex-attributes.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglAttributeBuffer---Buffers-of-vertex-attributes.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglAttributeBuffer---Buffers-of-vertex-attributes.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -104,7 +104,7 @@

    Note: You can assume this function always succeeds and won't return NULL

    -

    Parameters

    +

    Parameters

    @@ -126,7 +126,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglAttributeBuffer. Never NULL.

    [transfer full]

    @@ -169,7 +169,7 @@ explicitly catch errors with cogl_buffer_set_data() or cogl_buffer_map().
    -

    Parameters

    +

    Parameters

    @@ -197,7 +197,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglAttributeBuffer (never NULL).

    [transfer full]

    @@ -224,7 +224,7 @@ cogl_is_attribute_buffer (void *object);

    Gets whether the given object references a CoglAttributeBuffer.

    -

    Parameters

    +

    Parameters

    @@ -239,7 +239,7 @@
    -

    Returns

    +

    Returns

    TRUE if object references a CoglAttributeBuffer, FALSE otherwise

    @@ -270,6 +270,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25
    \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglBuffer---The-Buffer-Interface.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglBuffer---The-Buffer-Interface.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglBuffer---The-Buffer-Interface.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglBuffer---The-Buffer-Interface.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -194,7 +194,7 @@

    Checks whether buffer is a buffer object.

    -

    Parameters

    +

    Parameters

    @@ -209,7 +209,7 @@
    -

    Returns

    +

    Returns

    TRUE if the handle is a CoglBuffer, and FALSE otherwise

    Since: 1.2

    @@ -235,7 +235,7 @@ cogl_buffer_get_size (CoglBuffer *buffer);

    Retrieves the size of buffer

    -

    Parameters

    +

    Parameters

    @@ -250,7 +250,7 @@
    -

    Returns

    +

    Returns

    the size of the buffer in bytes

    Since: 1.2

    @@ -278,7 +278,7 @@

    Sets the update hint on a buffer. See CoglBufferUpdateHint for a description of the available hints.

    -

    Parameters

    +

    Parameters

    @@ -322,7 +322,7 @@ cogl_buffer_get_update_hint (CoglBuffer *buffer);

    Retrieves the update hints set using cogl_buffer_set_update_hint()

    -

    Parameters

    +

    Parameters

    @@ -337,7 +337,7 @@
    -

    Returns

    +

    Returns

    the CoglBufferUpdateHint currently used by the buffer

    Since: 1.2

    @@ -377,7 +377,7 @@ mask you pass. It is also an error to release your last reference while the buffer is mapped.

    -

    Parameters

    +

    Parameters

    @@ -405,7 +405,7 @@
    -

    Returns

    +

    Returns

    A pointer to the mapped memory or NULL is the call fails.

    [transfer none]

    @@ -451,7 +451,7 @@ mask you pass. It is also an error to release your last reference while the buffer is mapped.

    -

    Parameters

    +

    Parameters

    @@ -494,7 +494,7 @@
    -

    Returns

    +

    Returns

    A pointer to the mapped memory or NULL is the call fails.

    [transfer none]

    @@ -522,7 +522,7 @@ cogl_buffer_unmap (CoglBuffer *buffer);

    Unmaps a buffer previously mapped by cogl_buffer_map().

    -

    Parameters

    +

    Parameters

    @@ -568,7 +568,7 @@ should be less than the buffer size.

    -

    Parameters

    +

    Parameters

    @@ -600,7 +600,7 @@
    -

    Returns

    +

    Returns

    TRUE is the operation succeeded, FALSE otherwise

    Since: 1.2

    @@ -637,7 +637,7 @@ and immediately copied into the new buffer.

    -

    Parameters

    +

    Parameters

    @@ -664,7 +664,7 @@
    -

    Returns

    +

    Returns

    a newly allocated CoglPixelBuffer.

    [transfer full]

    @@ -692,7 +692,7 @@

    Checks whether object is a pixel buffer.

    -

    Parameters

    +

    Parameters

    @@ -707,7 +707,7 @@
    -

    Returns

    +

    Returns

    TRUE if the object is a pixel buffer, and FALSE otherwise

    @@ -742,7 +742,7 @@

    The update hint on a buffer allows the user to give some detail on how often the buffer data is going to be updated.

    -

    Members

    +

    Members

    @@ -796,7 +796,7 @@

    enum CoglBufferAccess

    The access hints for cogl_buffer_set_update_hint()

    -

    Members

    +

    Members

    @@ -851,7 +851,7 @@

    Hints to Cogl about how you are planning to modify the data once it is mapped.

    -

    Members

    +

    Members

    @@ -906,6 +906,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglDisplay---Setup-a-display-pipeline.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglDisplay---Setup-a-display-pipeline.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglDisplay---Setup-a-display-pipeline.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglDisplay---Setup-a-display-pipeline.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -128,7 +128,7 @@ cogl_is_display (void *object);

    Gets whether the given object references a CoglDisplay.

    -

    Parameters

    +

    Parameters

    @@ -143,7 +143,7 @@
    -

    Returns

    +

    Returns

    TRUE if the object references a CoglDisplay and FALSE otherwise.

    @@ -197,7 +197,7 @@ abort with a message. For simple applications with no fallback options then relying on the implicit setup can be fine.

    -

    Parameters

    +

    Parameters

    @@ -219,7 +219,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglDisplay object in a mutable configuration mode.

    [transfer full]

    @@ -248,7 +248,7 @@

    Queries the CoglRenderer associated with the given display .

    -

    Parameters

    +

    Parameters

    @@ -263,7 +263,7 @@
    -

    Returns

    +

    Returns

    The associated CoglRenderer.

    [transfer none]

    @@ -308,7 +308,7 @@ with a message. For simple applications that don't have any fallback options this behaviour may be fine.

    -

    Parameters

    +

    Parameters

    @@ -330,7 +330,7 @@
    -

    Returns

    +

    Returns

    Returns TRUE if there was no error, else it returns FALSE and returns an exception via error .

    @@ -360,7 +360,7 @@

    Request that Cogl output to a specific GDL overlay plane .

    -

    Parameters

    +

    Parameters

    @@ -408,7 +408,7 @@ enables Cogl to register private wayland extensions required to pass buffers between the clients and compositor.

    -

    Parameters

    +

    Parameters

    @@ -455,6 +455,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglFramebuffer---The-Framebuffer-Interface.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglFramebuffer---The-Framebuffer-Interface.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglFramebuffer---The-Framebuffer-Interface.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglFramebuffer---The-Framebuffer-Interface.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -579,7 +579,7 @@ program will abort with an error message if there is an error during automatic allocation.
    -

    Parameters

    +

    Parameters

    @@ -601,7 +601,7 @@
    -

    Returns

    +

    Returns

    TRUE if there were no error allocating the framebuffer, else FALSE.

    Since: 1.8

    @@ -628,7 +628,7 @@

    Queries the current width of the given framebuffer .

    -

    Parameters

    +

    Parameters

    @@ -643,7 +643,7 @@
    -

    Returns

    +

    Returns

    The width of framebuffer .

    @@ -671,7 +671,7 @@

    Queries the current height of the given framebuffer .

    -

    Parameters

    +

    Parameters

    @@ -686,7 +686,7 @@
    -

    Returns

    +

    Returns

    The height of framebuffer .

    @@ -729,7 +729,7 @@ drivers only allow the use of integer values. In the future floating point values will be exposed via a checkable feature.
    -

    Parameters

    +

    Parameters

    @@ -791,7 +791,7 @@

    Queries the x coordinate of the viewport origin as set using cogl_framebuffer_set_viewport() or the default value which is 0.

    -

    Parameters

    +

    Parameters

    @@ -806,7 +806,7 @@
    -

    Returns

    +

    Returns

    The x coordinate of the viewport origin.

    Since: 1.8

    @@ -833,7 +833,7 @@

    Queries the y coordinate of the viewport origin as set using cogl_framebuffer_set_viewport() or the default value which is 0.

    -

    Parameters

    +

    Parameters

    @@ -848,7 +848,7 @@
    -

    Returns

    +

    Returns

    The y coordinate of the viewport origin.

    Since: 1.8

    @@ -875,7 +875,7 @@

    Queries the width of the viewport as set using cogl_framebuffer_set_viewport() or the default value which is the width of the framebuffer.

    -

    Parameters

    +

    Parameters

    @@ -890,7 +890,7 @@
    -

    Returns

    +

    Returns

    The width of the viewport.

    Since: 1.8

    @@ -917,7 +917,7 @@

    Queries the height of the viewport as set using cogl_framebuffer_set_viewport() or the default value which is the height of the framebuffer.

    -

    Parameters

    +

    Parameters

    @@ -932,7 +932,7 @@
    -

    Returns

    +

    Returns

    The height of the viewport.

    Since: 1.8

    @@ -963,7 +963,7 @@ given viewport array.

    -

    Parameters

    +

    Parameters

    @@ -1010,7 +1010,7 @@

    Retrieves the number of red bits of framebuffer

    -

    Parameters

    +

    Parameters

    @@ -1025,7 +1025,7 @@
    -

    Returns

    +

    Returns

    the number of bits

    Since: 1.8

    @@ -1052,7 +1052,7 @@

    Retrieves the number of green bits of framebuffer

    -

    Parameters

    +

    Parameters

    @@ -1067,7 +1067,7 @@
    -

    Returns

    +

    Returns

    the number of bits

    Since: 1.8

    @@ -1094,7 +1094,7 @@

    Retrieves the number of blue bits of framebuffer

    -

    Parameters

    +

    Parameters

    @@ -1109,7 +1109,7 @@
    -

    Returns

    +

    Returns

    the number of bits

    Since: 1.8

    @@ -1136,7 +1136,7 @@

    Retrieves the number of alpha bits of framebuffer

    -

    Parameters

    +

    Parameters

    @@ -1151,7 +1151,7 @@
    -

    Returns

    +

    Returns

    the number of bits

    Since: 1.8

    @@ -1178,7 +1178,7 @@

    Retrieves the number of depth bits of framebuffer

    -

    Parameters

    +

    Parameters

    @@ -1193,7 +1193,7 @@
    -

    Returns

    +

    Returns

    the number of bits

    Since: 2.0

    @@ -1221,7 +1221,7 @@ current framebuffer. Each bit set in the mask means that the corresponding color would be written.

    -

    Parameters

    +

    Parameters

    @@ -1236,7 +1236,7 @@
    -

    Returns

    +

    Returns

    A CoglColorMask

    Since: 1.8

    @@ -1267,7 +1267,7 @@ that means that color will be written.

    -

    Parameters

    +

    Parameters

    @@ -1323,7 +1323,7 @@ framebuffer has been allocated the value will reflect the actual number of samples that will be made by the GPU.

    -

    Parameters

    +

    Parameters

    @@ -1338,7 +1338,7 @@
    -

    Returns

    +

    Returns

    The number of point samples made per pixel when rasterizing geometry or 0 if single-sample rendering has been chosen.

    @@ -1398,7 +1398,7 @@ framebuffer has changed this can lead to redundant work being done.
    -

    Parameters

    +

    Parameters

    @@ -1458,7 +1458,7 @@ should consider using cogl_framebuffer_resolve_samples_region() instead to avoid resolving redundant pixels.

    -

    Parameters

    +

    Parameters

    @@ -1517,7 +1517,7 @@ and if you have rendered to a larger region then it's possible that other samples may be implicitly resolved.

    -

    Parameters

    +

    Parameters

    @@ -1579,7 +1579,7 @@ instantiated within. This is the CoglContext that was passed to cogl_onscreen_new() for example.

    -

    Parameters

    +

    Parameters

    @@ -1594,7 +1594,7 @@
    -

    Returns

    +

    Returns

    The CoglContext that the given framebuffer was instantiated within.

    @@ -1628,7 +1628,7 @@ that includes the color buffer then the specified color is used.

    -

    Parameters

    +

    Parameters

    @@ -1688,7 +1688,7 @@ that includes the color buffer then the specified color is used.

    -

    Parameters

    +

    Parameters

    @@ -1775,7 +1775,7 @@ should either specify a format that doesn't use an alpha channel or use one of the formats ending in PRE.

    -

    Parameters

    +

    Parameters

    @@ -1813,7 +1813,7 @@
    -

    Returns

    +

    Returns

    TRUE if the read succeeded or FALSE otherwise. The function is only likely to fail if the bitmap points to a pixel buffer and it could not be mapped.

    @@ -1887,7 +1887,7 @@

    -

    Parameters

    +

    Parameters

    @@ -1934,7 +1934,7 @@
    -

    Returns

    +

    Returns

    TRUE if the read succeeded or FALSE otherwise.

    Since: 1.10

    @@ -1971,7 +1971,7 @@ then this has no affect.

    Dithering is enabled by default.

    -

    Parameters

    +

    Parameters

    @@ -2020,7 +2020,7 @@ display pipeline does not support dithering. This value only represents the user's request for dithering.
    -

    Parameters

    +

    Parameters

    @@ -2035,7 +2035,7 @@
    -

    Returns

    +

    Returns

    TRUE if dithering has been requested or FALSE if not.

    Since: 1.8

    @@ -2080,7 +2080,7 @@ it then you can use cogl_framebuffer_draw_textured_rectangle().
    -

    Parameters

    +

    Parameters

    @@ -2193,7 +2193,7 @@ with non-normalized texture coordinates this api should still be passed normalized texture coordinates.
    -

    Parameters

    +

    Parameters

    @@ -2328,7 +2328,7 @@ than there are layers in the current source material then default texture coordinates (0.0, 0.0, 1.0, 1.0) are generated.

    -

    Parameters

    +

    Parameters

    @@ -2430,7 +2430,7 @@ same pipeline state.

    -

    Parameters

    +

    Parameters

    @@ -2528,7 +2528,7 @@ coordinates this api should still be passed normalized texture coordinates.
    -

    Parameters

    +

    Parameters

    @@ -2601,7 +2601,7 @@ framebuffer, and it's not meaningful to try and discard the color buffer of a CoglOffscreen framebuffer since they are single-buffered.

    -

    Parameters

    +

    Parameters

    @@ -2653,7 +2653,7 @@ measurements reflect the time that the GPU is busy for not just the time it takes to queue rendering commands.

    -

    Parameters

    +

    Parameters

    @@ -2691,7 +2691,7 @@

    Copies the current model-view matrix onto the matrix stack. The matrix can later be restored with cogl_framebuffer_pop_matrix().

    -

    Parameters

    +

    Parameters

    @@ -2714,7 +2714,7 @@ cogl_framebuffer_pop_matrix (CoglFramebuffer *framebuffer);

    Restores the model-view matrix on the top of the matrix stack.

    -

    Parameters

    +

    Parameters

    @@ -2737,7 +2737,7 @@ cogl_framebuffer_identity_matrix (CoglFramebuffer *framebuffer);

    Resets the current model-view matrix to the identity matrix.

    -

    Parameters

    +

    Parameters

    @@ -2778,7 +2778,7 @@

    Multiplies the current model-view matrix by one that scales the x, y and z axes by the given values.

    -

    Parameters

    +

    Parameters

    @@ -2836,7 +2836,7 @@

    Multiplies the current model-view matrix by one that translates the model along all three axes according to the given values.

    -

    Parameters

    +

    Parameters

    @@ -2901,7 +2901,7 @@ by 10 degrees about the axis-vector (0, 0, 1) causes a small counter-clockwise rotation.

    -

    Parameters

    +

    Parameters

    @@ -2963,7 +2963,7 @@ according to the rotation described by euler .

    -

    Parameters

    +

    Parameters

    @@ -3010,7 +3010,7 @@ according to the rotation described by quaternion .

    -

    Parameters

    +

    Parameters

    @@ -3055,7 +3055,7 @@ const CoglMatrix *matrix);

    Multiplies the current model-view matrix by the given matrix.

    -

    Parameters

    +

    Parameters

    @@ -3101,7 +3101,7 @@

    Stores the current model-view matrix in matrix .

    -

    Parameters

    +

    Parameters

    @@ -3147,7 +3147,7 @@

    Sets matrix as the new model-view matrix.

    -

    Parameters

    +

    Parameters

    @@ -3200,7 +3200,7 @@ since there wont be enough precision to identify the depth of objects near to each other.
    -

    Parameters

    +

    Parameters

    @@ -3268,7 +3268,7 @@ for a given viewing frustum defined by 4 side clip planes that all cross through the origin and 2 near and far clip planes.

    -

    Parameters

    +

    Parameters

    @@ -3348,7 +3348,7 @@

    Replaces the current projection matrix with an orthographic projection matrix.

    -

    Parameters

    +

    Parameters

    @@ -3424,7 +3424,7 @@

    Stores the current projection matrix in matrix .

    -

    Parameters

    +

    Parameters

    @@ -3471,7 +3471,7 @@

    Sets matrix as the new projection matrix.

    -

    Parameters

    +

    Parameters

    @@ -3525,7 +3525,7 @@

    The rectangle is intersected with the current clip region. To undo the effect of this function, call cogl_framebuffer_pop_clip().

    -

    Parameters

    +

    Parameters

    @@ -3594,7 +3594,7 @@

    The rectangle is intersected with the current clip region. To undo the effect of this function, call cogl_framebuffer_pop_clip().

    -

    Parameters

    +

    Parameters

    @@ -3668,7 +3668,7 @@ restore the previous clipping area, call cogl_framebuffer_pop_clip().

    -

    Parameters

    +

    Parameters

    @@ -3738,7 +3738,7 @@ cogl_framebuffer_push_scissor_clip(), cogl_framebuffer_push_rectangle_clip()cogl_framebuffer_push_path_clip(), or cogl_framebuffer_push_primitive_clip().

    -

    Parameters

    +

    Parameters

    @@ -3776,7 +3776,7 @@

    Gets the current CoglFramebuffer as set using cogl_push_framebuffer()

    -

    Returns

    +

    Returns

    The current CoglFramebuffer.

    [transfer none]

    @@ -3811,7 +3811,7 @@ either be an offscreen buffer created with cogl_offscreen_new_to_texture() or in the future it may be an onscreen framebuffers too.

    -

    Parameters

    +

    Parameters

    @@ -3956,7 +3956,7 @@

    The previous framebuffer can be restored by calling cogl_pop_framebuffer()

    -

    Parameters

    +

    Parameters

    @@ -3998,6 +3998,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglIndexBuffer---Buffers-of-vertex-indices.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglIndexBuffer---Buffers-of-vertex-indices.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglIndexBuffer---Buffers-of-vertex-indices.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglIndexBuffer---Buffers-of-vertex-indices.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -89,7 +89,7 @@ cogl_buffer_set_data() or by mapping it into the application's address space using cogl_buffer_map().

    -

    Parameters

    +

    Parameters

    @@ -111,7 +111,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglIndexBuffer.

    [transfer full]

    @@ -138,7 +138,7 @@ cogl_is_index_buffer (void *object);

    Gets whether the given object references a CoglIndexBuffer.

    -

    Parameters

    +

    Parameters

    @@ -153,7 +153,7 @@
    -

    Returns

    +

    Returns

    TRUE if the object references a CoglIndexBuffer, FALSE otherwise

    @@ -184,6 +184,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25
    \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglOnscreenTemplate---Describe-a-template-for-onscreen-framebuffers.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglOnscreenTemplate---Describe-a-template-for-onscreen-framebuffers.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglOnscreenTemplate---Describe-a-template-for-onscreen-framebuffers.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglOnscreenTemplate---Describe-a-template-for-onscreen-framebuffers.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -82,7 +82,7 @@ cogl_is_onscreen_template (void *object);

    Gets whether the given object references a CoglOnscreenTemplate.

    -

    Parameters

    +

    Parameters

    @@ -97,7 +97,7 @@
    -

    Returns

    +

    Returns

    TRUE if the object references a CoglOnscreenTemplate and FALSE otherwise.

    @@ -133,6 +133,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25
    \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -297,7 +297,7 @@ cogl_is_onscreen (void *object);

    Gets whether the given object references a CoglOnscreen.

    -

    Parameters

    +

    Parameters

    @@ -312,7 +312,7 @@
    -

    Returns

    +

    Returns

    TRUE if the object references a CoglOnscreen and FALSE otherwise.

    @@ -350,7 +350,7 @@ it is first used or explicitly via cogl_framebuffer_allocate().

    [constructor]

    -

    Parameters

    +

    Parameters

    @@ -377,7 +377,7 @@
    -

    Returns

    +

    Returns

    A newly instantiated CoglOnscreen framebuffer.

    [transfer full]

    @@ -452,7 +452,7 @@ } }]

    -

    Parameters

    +

    Parameters

    @@ -517,7 +517,7 @@

    It's undefined what this function does if called when not using an x11 based renderer.

    -

    Parameters

    +

    Parameters

    @@ -567,7 +567,7 @@ has been allocated to set a foreign XID for your existing X window.

    -

    Parameters

    +

    Parameters

    @@ -614,7 +614,7 @@ framebuffer. If cogl_win32_onscreen_set_foreign_window() has been used then it will return the same handle set with that API.

    -

    Parameters

    +

    Parameters

    @@ -668,7 +668,7 @@ that it's acceptable to alternatively use native APIs to show and hide windows without confusing Cogl.
    -

    Parameters

    +

    Parameters

    @@ -717,7 +717,7 @@ that it's acceptable to alternatively use native APIs to show and hide windows without confusing Cogl.
    -

    Parameters

    +

    Parameters

    @@ -762,7 +762,7 @@ cogl_onscreen_add_frame_callback() for more details about what events can be notified.

    -

    Parameters

    +

    Parameters

    @@ -846,7 +846,7 @@ wasting resources, drawing more frames than your system compositor can display.

    -

    Parameters

    +

    Parameters

    @@ -882,7 +882,7 @@
    -

    Returns

    +

    Returns

    a CoglFrameClosure pointer that can be used to remove the callback and associated user_data later.

    @@ -915,7 +915,7 @@ cogl_onscreen_add_frame_callback() to destroy the user data then this will get called.

    -

    Parameters

    +

    Parameters

    @@ -965,7 +965,7 @@ system determines that a region of the onscreen window has been lost and the application should redraw it.

    -

    Parameters

    +

    Parameters

    @@ -1034,7 +1034,7 @@ the dirty region to ensure that the framebuffer is actually ready for rendering.

    -

    Parameters

    +

    Parameters

    @@ -1071,7 +1071,7 @@
    -

    Returns

    +

    Returns

    a CoglOnscreenDirtyClosure pointer that can be used to remove the callback and associated user_data later.

    @@ -1104,7 +1104,7 @@ cogl_onscreen_add_dirty_callback() to destroy the user data then this will also get called.

    -

    Parameters

    +

    Parameters

    @@ -1163,7 +1163,7 @@ occur while an application might have arbitrary locks held for example.
    -

    Parameters

    +

    Parameters

    @@ -1227,7 +1227,7 @@ occur while an application might have arbitrary locks held for example.
    -

    Parameters

    +

    Parameters

    @@ -1265,7 +1265,7 @@
    -

    Returns

    +

    Returns

    a CoglOnscreenResizeClosure pointer that can be used to remove the callback and associated user_data later.

    @@ -1284,7 +1284,7 @@ associated with onscreen via cogl_onscreen_add_resize_callback().

    -

    Parameters

    +

    Parameters

    @@ -1324,7 +1324,7 @@ perform incremental updates to older buffers instead of having to render a full buffer for every frame.
    -

    Parameters

    +

    Parameters

    @@ -1395,7 +1395,7 @@ the cogl_onscreen_get_buffer_age() api so that your application can perform incremental rendering based on old back buffers.
    -

    Parameters

    +

    Parameters

    @@ -1457,7 +1457,7 @@ start a new frame that incrementally builds on the contents of the previous frame.

    -

    Parameters

    +

    Parameters

    @@ -1513,7 +1513,7 @@ displays vblank period or perhaps some other mechanism in a composited environment.

    -

    Parameters

    +

    Parameters

    @@ -1582,7 +1582,7 @@ your application will be able to avoid long blocks in the driver caused by throttling when you request to swap buffers too quickly.

    -

    Parameters

    +

    Parameters

    @@ -1611,7 +1611,7 @@
    -

    Returns

    +

    Returns

    a unique identifier that can be used to remove to remove the callback later.

    @@ -1645,7 +1645,7 @@

    Removes a callback that was previously registered using cogl_onscreen_add_swap_buffers_callback().

    -

    Parameters

    +

    Parameters

    @@ -1726,7 +1726,7 @@ cogl_onscreen_add_dirty_callback(). The members describe a rectangle within the onscreen buffer that should be redrawn.

    -

    Members

    +

    Members

    @@ -1827,6 +1827,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglRenderer---Connect-to-a-backend-renderer.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglRenderer---Connect-to-a-backend-renderer.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglRenderer---Connect-to-a-backend-renderer.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglRenderer---Connect-to-a-backend-renderer.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -278,7 +278,7 @@

    Determines if the given object is a CoglRenderer

    -

    Parameters

    +

    Parameters

    @@ -293,7 +293,7 @@
    -

    Returns

    +

    Returns

    TRUE if object is a CoglRenderer, else FALSE.

    @@ -345,7 +345,7 @@ so Cogl will automatically connect and setup a renderer and display.
    -

    Returns

    +

    Returns

    A newly created CoglRenderer.

    [transfer full]

    @@ -373,7 +373,7 @@ (CoglRenderer *renderer);

    Queries how many texture units can be used from fragment programs

    -

    Parameters

    +

    Parameters

    @@ -388,7 +388,7 @@
    -

    Returns

    +

    Returns

    the number of texture image units.

    Since: 1.8

    @@ -419,7 +419,7 @@ any given constraint criteria can be satisfied and that a usable driver and window system backend can be found.

    -

    Parameters

    +

    Parameters

    @@ -441,7 +441,7 @@
    -

    Returns

    +

    Returns

    TRUE if there was no error while connecting the given renderer . FALSE if there was an error.

    @@ -474,7 +474,7 @@ will fail and report an error.

    This may only be called on an un-connected CoglRenderer.

    -

    Parameters

    +

    Parameters

    @@ -504,7 +504,7 @@

    Queries which window system backend Cogl has chosen to use.

    This may only be called on a connected CoglRenderer.

    -

    Parameters

    +

    Parameters

    @@ -519,7 +519,7 @@
    -

    Returns

    +

    Returns

    The CoglWinsysID corresponding to the chosen window system backend.

    @@ -535,7 +535,7 @@

    Applications should ideally minimize how many of these constraints they depend on to ensure maximum portability.

    -

    Parameters

    +

    Parameters

    @@ -583,7 +583,7 @@

    Applications should ideally minimize how many of these constraints they depend on to ensure maximum portability.

    -

    Parameters

    +

    Parameters

    @@ -676,7 +676,7 @@ COGL_FILTER_REMOVE if it wants to prevent further processing or COGL_FILTER_CONTINUE otherwise.

    -

    Parameters

    +

    Parameters

    @@ -709,7 +709,7 @@ function can stop further processing of the event by return COGL_FILTER_REMOVE.

    -

    Parameters

    +

    Parameters

    @@ -747,7 +747,7 @@

    Removes a callback that was previously added with cogl_win32_renderer_add_filter().

    -

    Parameters

    +

    Parameters

    @@ -784,7 +784,7 @@ external event retrieval (for example that done by Clutter or GDK).

    -

    Parameters

    +

    Parameters

    @@ -806,7 +806,7 @@
    -

    Returns

    +

    Returns

    CoglFilterReturn. COGL_FILTER_REMOVE indicates that Cogl has internally handled the event and the caller should do no further processing. COGL_FILTER_CONTINUE indicates that Cogl is @@ -828,7 +828,7 @@ the application should call cogl_win32_renderer_handle_event() for each message if it disables automatic event retrieval.

    -

    Parameters

    +

    Parameters

    @@ -876,7 +876,7 @@ to work with instead of leaving Cogl to automatically connect to a wayland compositor.

    -

    Parameters

    +

    Parameters

    @@ -930,7 +930,7 @@ reading from the Wayland display socket, it should disable this to avoid having competing code read from the socket.

    -

    Parameters

    +

    Parameters

    @@ -980,7 +980,7 @@ renderer has not yet been connected (either implicitly or explicitly by calling cogl_renderer_connect()) in which case NULL is returned.

    -

    Parameters

    +

    Parameters

    @@ -995,7 +995,7 @@
    -

    Returns

    +

    Returns

    The wayland display currently associated with renderer , or NULL if the renderer hasn't yet been connected and no @@ -1031,7 +1031,7 @@

    These can be used to query what backend Cogl is using or to try and explicitly select a backend to use.

    -

    Members

    +

    Members

    @@ -1141,7 +1141,7 @@

    Applications should ideally minimize how many of these constraints they depend on to ensure maximum portability.

    -

    Members

    +

    Members

    @@ -1205,7 +1205,7 @@

    enum CoglFilterReturn

    Return values for the CoglXlibFilterFunc and CoglWin32FilterFunc functions.

    -

    Members

    +

    Members

    @@ -1249,6 +1249,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Color-Type.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Color-Type.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Color-Type.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Color-Type.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -336,7 +336,7 @@ cogl_color_new (void);

    Creates a new (empty) color

    -

    Returns

    +

    Returns

    a newly-allocated CoglColor. Use cogl_color_free() to free the allocated resources

    @@ -350,7 +350,7 @@

    Creates a copy of color

    -

    Parameters

    +

    Parameters

    @@ -365,7 +365,7 @@
    -

    Returns

    +

    Returns

    a newly-allocated CoglColor. Use cogl_color_free() to free the allocate resources

    @@ -378,7 +378,7 @@ cogl_color_free (CoglColor *color);

    Frees the resources allocated by cogl_color_new() and cogl_color_copy()

    -

    Parameters

    +

    Parameters

    @@ -409,7 +409,7 @@

    Sets the values of the passed channels into a CoglColor.

    -

    Parameters

    +

    Parameters

    @@ -462,7 +462,7 @@

    Sets the values of the passed channels into a CoglColor

    -

    Parameters

    +

    Parameters

    @@ -509,7 +509,7 @@ as a fixed point value between 0 and 1.0.

    -

    Parameters

    +

    Parameters

    @@ -524,7 +524,7 @@
    -

    Returns

    +

    Returns

    the red channel of the passed color

    Since: 1.0

    @@ -538,7 +538,7 @@ as a fixed point value between 0 and 1.0.

    -

    Parameters

    +

    Parameters

    @@ -553,7 +553,7 @@
    -

    Returns

    +

    Returns

    the green channel of the passed color

    Since: 1.0

    @@ -567,7 +567,7 @@ as a fixed point value between 0 and 1.0.

    -

    Parameters

    +

    Parameters

    @@ -582,7 +582,7 @@
    -

    Returns

    +

    Returns

    the blue channel of the passed color

    Since: 1.0

    @@ -596,7 +596,7 @@ as a fixed point value between 0 and 1.0.

    -

    Parameters

    +

    Parameters

    @@ -611,7 +611,7 @@
    -

    Returns

    +

    Returns

    the alpha channel of the passed color

    Since: 1.0

    @@ -625,7 +625,7 @@ as a byte value between 0 and 255

    -

    Parameters

    +

    Parameters

    @@ -640,7 +640,7 @@
    -

    Returns

    +

    Returns

    the red channel of the passed color

    Since: 1.0

    @@ -654,7 +654,7 @@ as a byte value between 0 and 255

    -

    Parameters

    +

    Parameters

    @@ -669,7 +669,7 @@
    -

    Returns

    +

    Returns

    the green channel of the passed color

    Since: 1.0

    @@ -683,7 +683,7 @@ as a byte value between 0 and 255

    -

    Parameters

    +

    Parameters

    @@ -698,7 +698,7 @@
    -

    Returns

    +

    Returns

    the blue channel of the passed color

    Since: 1.0

    @@ -712,7 +712,7 @@ as a byte value between 0 and 255

    -

    Parameters

    +

    Parameters

    @@ -727,7 +727,7 @@
    -

    Returns

    +

    Returns

    the alpha channel of the passed color

    Since: 1.0

    @@ -741,7 +741,7 @@ as a floating point value between 0.0 and 1.0

    -

    Parameters

    +

    Parameters

    @@ -756,7 +756,7 @@
    -

    Returns

    +

    Returns

    the red channel of the passed color

    Since: 1.0

    @@ -770,7 +770,7 @@ as a floating point value between 0.0 and 1.0

    -

    Parameters

    +

    Parameters

    @@ -785,7 +785,7 @@
    -

    Returns

    +

    Returns

    the green channel of the passed color

    Since: 1.0

    @@ -799,7 +799,7 @@ as a floating point value between 0.0 and 1.0

    -

    Parameters

    +

    Parameters

    @@ -814,7 +814,7 @@
    -

    Returns

    +

    Returns

    the blue channel of the passed color

    Since: 1.0

    @@ -828,7 +828,7 @@ as a floating point value between 0.0 and 1.0

    -

    Parameters

    +

    Parameters

    @@ -843,7 +843,7 @@
    -

    Returns

    +

    Returns

    the alpha channel of the passed color

    Since: 1.0

    @@ -858,7 +858,7 @@ to red .

    -

    Parameters

    +

    Parameters

    @@ -891,7 +891,7 @@ to green .

    -

    Parameters

    +

    Parameters

    @@ -924,7 +924,7 @@ to blue .

    -

    Parameters

    +

    Parameters

    @@ -957,7 +957,7 @@ to alpha .

    -

    Parameters

    +

    Parameters

    @@ -990,7 +990,7 @@ to red .

    -

    Parameters

    +

    Parameters

    @@ -1023,7 +1023,7 @@ to green .

    -

    Parameters

    +

    Parameters

    @@ -1056,7 +1056,7 @@ to blue .

    -

    Parameters

    +

    Parameters

    @@ -1089,7 +1089,7 @@ to alpha .

    -

    Parameters

    +

    Parameters

    @@ -1122,7 +1122,7 @@ to red .

    -

    Parameters

    +

    Parameters

    @@ -1155,7 +1155,7 @@ to green .

    -

    Parameters

    +

    Parameters

    @@ -1188,7 +1188,7 @@ to blue .

    -

    Parameters

    +

    Parameters

    @@ -1221,7 +1221,7 @@ to alpha .

    -

    Parameters

    +

    Parameters

    @@ -1253,7 +1253,7 @@ example, semi-transparent red is (1.0, 0, 0, 0.5) when non-premultiplied and (0.5, 0, 0, 0.5) when premultiplied.

    -

    Parameters

    +

    Parameters

    @@ -1278,7 +1278,7 @@ example, semi-transparent red is (0.5, 0, 0, 0.5) when premultiplied and (1.0, 0, 0, 0.5) when non-premultiplied.

    -

    Parameters

    +

    Parameters

    @@ -1305,7 +1305,7 @@ parameter, when using CoglColors as keys in a GHashTable.

    -

    Parameters

    +

    Parameters

    @@ -1327,7 +1327,7 @@
    -

    Returns

    +

    Returns

    TRUE if the two colors are the same.

    Since: 1.0

    @@ -1343,7 +1343,7 @@

    Converts a color expressed in HLS (hue, luminance and saturation) values into a CoglColor.

    -

    Parameters

    +

    Parameters

    @@ -1392,7 +1392,7 @@ saturation values are in the 0 .. 1 range.

    -

    Parameters

    +

    Parameters

    @@ -1437,7 +1437,7 @@ the CoglColor structure are private and should never by accessed directly.

    -

    Members

    +

    Members

    @@ -1452,6 +1452,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Common-Types.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Common-Types.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Common-Types.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Common-Types.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -149,7 +149,7 @@

    A convenience vertex definition that can be used with cogl_primitive_new_p2().

    -

    Members

    +

    Members

    @@ -196,7 +196,7 @@

    A convenience vertex definition that can be used with cogl_primitive_new_p3().

    -

    Members

    +

    Members

    @@ -249,7 +249,7 @@

    A convenience vertex definition that can be used with cogl_primitive_new_p2c4().

    -

    Members

    +

    Members

    @@ -317,7 +317,7 @@

    A convenience vertex definition that can be used with cogl_primitive_new_p3c4().

    -

    Members

    +

    Members

    @@ -390,7 +390,7 @@

    A convenience vertex definition that can be used with cogl_primitive_new_p2t2().

    -

    Members

    +

    Members

    @@ -448,7 +448,7 @@

    A convenience vertex definition that can be used with cogl_primitive_new_p3t2().

    -

    Members

    +

    Members

    @@ -512,7 +512,7 @@

    A convenience vertex definition that can be used with cogl_primitive_new_p3t2c4().

    -

    Members

    +

    Members

    @@ -591,7 +591,7 @@

    A convenience vertex definition that can be used with cogl_primitive_new_p3t2c4().

    -

    Members

    +

    Members

    @@ -668,7 +668,7 @@

    enum CoglVerticesMode

    Different ways of interpreting vertices when drawing.

    -

    Members

    +

    Members

    @@ -755,7 +755,7 @@ internal format. Cogl will try to pick the best format to use internally and convert the texture data if necessary.

    -

    Members

    +

    Members

    @@ -986,7 +986,7 @@

    enum CoglBufferTarget

    Target flags for FBOs.

    -

    Members

    +

    Members

    @@ -1018,7 +1018,7 @@

    enum CoglBufferBit

    Types of auxiliary buffers

    -

    Members

    +

    Members

    @@ -1057,7 +1057,7 @@

    enum CoglAttributeType

    Data types for the components of a vertex attribute.

    -

    Members

    +

    Members

    @@ -1115,7 +1115,7 @@ channels should be written to the current framebuffer when drawing something.

    -

    Members

    +

    Members

    @@ -1174,7 +1174,7 @@

    enum CoglTextureFlags

    Flags to pass to the cogl_texture_new_* family of functions.

    -

    Members

    +

    Members

    @@ -1240,6 +1240,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Depth-State.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Depth-State.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Depth-State.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Depth-State.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -148,7 +148,7 @@

    You should never pass an un initialized CoglDepthState structure to cogl_pipeline_set_depth_state().

    -

    Parameters

    +

    Parameters

    @@ -199,7 +199,7 @@ to then set the state on a CoglPipeline using cogl_pipeline_set_depth_state()

    -

    Parameters

    +

    Parameters

    @@ -244,7 +244,7 @@

    Gets the current depth test enabled state as previously set by cogl_depth_state_set_test_enabled().

    -

    Parameters

    +

    Parameters

    @@ -259,7 +259,7 @@
    -

    Returns

    +

    Returns

    The pipeline's current depth test enabled state.

    Since: 2.0

    @@ -292,7 +292,7 @@ to then set the state on a CoglPipeline using cogl_pipeline_set_depth_state()

    -

    Parameters

    +

    Parameters

    @@ -337,7 +337,7 @@

    Gets the current depth test enable state as previously set via cogl_depth_state_set_test_enabled().

    -

    Parameters

    +

    Parameters

    @@ -352,7 +352,7 @@
    -

    Returns

    +

    Returns

    The current depth test enable state.

    Since: 2.0

    @@ -388,7 +388,7 @@ to then set the state on a CoglPipeline using cogl_pipeline_set_depth_state()

    -

    Parameters

    +

    Parameters

    @@ -433,7 +433,7 @@

    Gets the depth writing enable state as set by the corresponding cogl_depth_state_set_write_enabled().

    -

    Parameters

    +

    Parameters

    @@ -448,7 +448,7 @@
    -

    Returns

    +

    Returns

    The current depth writing enable state

    Since: 2.0

    @@ -496,7 +496,7 @@ to then set the state on a CoglPipeline using cogl_pipeline_set_depth_state().

    -

    Parameters

    +

    Parameters

    @@ -551,7 +551,7 @@ before writing to the depth buffer. This corresponds to the range set with cogl_depth_state_set_range().

    -

    Parameters

    +

    Parameters

    @@ -613,7 +613,7 @@

    The test is only done when depth testing is explicitly enabled. (See cogl_depth_state_set_test_enabled())

    -

    Members

    +

    Members

    @@ -690,6 +690,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental.devhelp2 cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental.devhelp2 --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental.devhelp2 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental.devhelp2 2016-08-26 17:38:09.000000000 +0000 @@ -204,7 +204,6 @@ - @@ -246,6 +245,7 @@ + @@ -351,11 +351,10 @@ - + - @@ -368,6 +367,7 @@ + @@ -667,7 +667,6 @@ - @@ -678,6 +677,7 @@ + diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Eulers-(Rotations).html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Eulers-(Rotations).html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Eulers-(Rotations).html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Eulers-(Rotations).html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -193,7 +193,7 @@ z_angle degrees around the z axis.

    -

    Parameters

    +

    Parameters

    @@ -237,7 +237,7 @@ initializses euler with the component x, y and z rotation angles.

    -

    Parameters

    +

    Parameters

    @@ -271,7 +271,7 @@ represented by the given quaternion .

    -

    Parameters

    +

    Parameters

    @@ -307,7 +307,7 @@ are numerically equal, it does not consider that some rotations can be represented with different component rotations
    -

    Parameters

    +

    Parameters

    @@ -329,7 +329,7 @@
    -

    Returns

    +

    Returns

    TRUE if v1 and v2 are equal else FALSE.

    @@ -346,7 +346,7 @@ . The newly allocated euler should be freed using cogl_euler_free().

    -

    Parameters

    +

    Parameters

    @@ -361,7 +361,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglEuler

    Since: 2.0

    @@ -374,7 +374,7 @@

    Frees a CoglEuler that was previously allocated using cogl_euler_copy().

    -

    Parameters

    +

    Parameters

    @@ -415,7 +415,7 @@

    You may also want to look at cogl_quaternion_init_from_euler() if you want to do interpolation between 3d rotations.

    -

    Members

    +

    Members

    @@ -446,6 +446,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Exception-handling.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Exception-handling.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Exception-handling.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Exception-handling.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -197,7 +197,7 @@ , FALSE otherwise. In particular, when error is NULL, FALSE will be returned.

    -

    Parameters

    +

    Parameters

    @@ -224,7 +224,7 @@
    -

    Returns

    +

    Returns

    whether the error corresponds to the given domain and code @@ -238,7 +238,7 @@ cogl_error_free (CoglError *error);

    Frees a CoglError and associated resources.

    -

    Parameters

    +

    Parameters

    @@ -262,7 +262,7 @@ which can later be freed using cogl_error_free().

    -

    Parameters

    +

    Parameters

    @@ -277,7 +277,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglError initialized to match the contents of error .

    @@ -293,7 +293,7 @@ that a CoglError is a GError and can be used directly with the GError api.

    -

    Parameters

    +

    Parameters

    @@ -316,7 +316,7 @@ 
    #define CoglError GError
    -

    Parameters

    +

    Parameters

    @@ -346,6 +346,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GLES-2.0-context.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GLES-2.0-context.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GLES-2.0-context.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GLES-2.0-context.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -40,10 +40,6 @@ - - - - @@ -126,6 +122,10 @@ + + + + @@ -155,29 +155,6 @@

    Functions

    -

    COGL_GLES2_CONTEXT_ERROR

    -
    #define COGL_GLES2_CONTEXT_ERROR (_cogl_gles2_context_error_quark ())
-
    -

    An error domain for runtime exceptions relating to the -cogl_gles2_context api.

    -

    Since: 2.0

    -

    Stability Level: Unstable

    -
    -
    -

    cogl_gles2_context_new ()

    CoglGLES2Context *
 cogl_gles2_context_new (CoglContext *ctx,
@@ -198,7 +175,7 @@
 return an COGL_GLES2_CONTEXT_ERROR_UNSUPPORTED error if the
 feature isn't available.
    -

    Parameters

    +

    Parameters

    #defineCOGL_GLES2_CONTEXT_ERROR
    CoglGLES2Context * CoglGLES2Vtable
    #defineCOGL_GLES2_CONTEXT_ERROR
    enum CoglGLES2ContextError
    @@ -220,7 +197,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglGLES2Context or NULL if there was an error and error will be updated in that case.

    @@ -248,7 +225,7 @@ cogl_is_gles2_context (void *object);

    Gets whether the given object references a CoglGLES2Context.

    -

    Parameters

    +

    Parameters

    @@ -263,7 +240,7 @@
    -

    Returns

    +

    Returns

    TRUE if the object references a CoglGLES2Context and FALSE otherwise.

    @@ -294,7 +271,7 @@
    You should not try to directly link to and use the symbols provided by any system OpenGLES 2.0 driver.
    -

    Parameters

    +

    Parameters

    @@ -310,7 +287,7 @@
    -

    Returns

    +

    Returns

    A pointer to a CoglGLES2Vtable providing pointers to functions for the full OpenGLES 2.0 api.

    @@ -353,7 +330,7 @@ an error through error .

    -

    Parameters

    +

    Parameters

    @@ -395,7 +372,7 @@
    -

    Returns

    +

    Returns

    TRUE if operation was successfull or FALSE otherwise and error will be updated.

    @@ -429,7 +406,7 @@ are not balenced with the number of corresponding calls to cogl_push_gles2_context().

    -

    Parameters

    +

    Parameters

    @@ -468,7 +445,7 @@ CoglGLES2Context (last pushed with cogl_push_gles2_context()) or NULL if no CoglGLES2Context has been pushed.

    -

    Returns

    +

    Returns

    The CoglGLES2Vtable for the currently pushed CoglGLES2Context or NULL if none has been pushed.

    @@ -510,7 +487,7 @@ handles created directly using the system's native libGLESv2 api.
    -

    Parameters

    +

    Parameters

    @@ -597,7 +574,7 @@ OpenGL ES 2.0 library, the handle is only intended to be used via a CoglGLES2Vtable or via libcogl-gles2.
    -

    Parameters

    +

    Parameters

    @@ -624,7 +601,7 @@
    -

    Returns

    +

    Returns

    TRUE if a handle and target could be returned otherwise FALSE is returned.

    @@ -696,10 +673,33 @@
    +

    COGL_GLES2_CONTEXT_ERROR

    +
    #define COGL_GLES2_CONTEXT_ERROR (_cogl_gles2_context_error_quark ())
+
    +

    An error domain for runtime exceptions relating to the +cogl_gles2_context api.

    +

    Since: 2.0

    +

    Stability Level: Unstable

    +
    +
    +

    enum CoglGLES2ContextError

    Error codes that relate to the cogl_gles2_context api.

    -

    Members

    +

    Members

    @@ -731,6 +731,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GPU-synchronisation-fences.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GPU-synchronisation-fences.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GPU-synchronisation-fences.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GPU-synchronisation-fences.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -110,7 +110,7 @@ cogl_framebuffer_add_fence_callback() for notification of GPU command completion.

    -

    Parameters

    +

    Parameters

    @@ -169,7 +169,7 @@ need to free the closure; it will be freed automatically when the callback is called, or cancelled.

    -

    Parameters

    +

    Parameters

    @@ -223,7 +223,7 @@ cogl_framebuffer_add_fence_callback(); the callback will not be called.

    -

    Parameters

    +

    Parameters

    @@ -311,6 +311,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GType-Integration-API.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GType-Integration-API.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GType-Integration-API.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GType-Integration-API.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -62,7 +62,7 @@

    Use cogl_matrix_get_gtype() instead.

    -

    Returns

    +

    Returns

    the GType for the registered "CoglMatrix" boxed type. This can be used for example to define GObject properties that accept a CoglMatrix value.

    @@ -74,6 +74,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-High-Level-Meta-Textures.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-High-Level-Meta-Textures.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-High-Level-Meta-Textures.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-High-Level-Meta-Textures.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -129,7 +129,7 @@ retrieve details of all the low-level CoglTextures that make up a given CoglMetaTexture.

    -

    Parameters

    +

    Parameters

    @@ -228,7 +228,7 @@ is called specifying how the low-level texture maps to the original region.

    -

    Parameters

    +

    Parameters

    @@ -314,6 +314,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Indices.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Indices.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Indices.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Indices.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -157,7 +157,7 @@ cogl_is_indices (void *object);

    Gets whether the given object references a CoglIndices.

    -

    Parameters

    +

    Parameters

    @@ -172,7 +172,7 @@
    -

    Returns

    +

    Returns

    TRUE if the object references a CoglIndices and FALSE otherwise.

    @@ -227,7 +227,7 @@ be available if the GL_OES_element_index_uint extension is advertized.

    -

    Members

    +

    Members

    @@ -263,6 +263,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Low-level-primitive-textures.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Low-level-primitive-textures.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Low-level-primitive-textures.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Low-level-primitive-textures.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -98,7 +98,7 @@ cogl_is_primitive_texture (void *object);

    Gets whether the given object references a primitive texture object.

    -

    Parameters

    +

    Parameters

    @@ -113,7 +113,7 @@
    -

    Returns

    +

    Returns

    TRUE if the pointer references a primitive texture, and FALSE otherwise

    @@ -147,7 +147,7 @@ disable this if it wants to upload its own data for the other levels. By default auto mipmapping is enabled.

    -

    Parameters

    +

    Parameters

    @@ -195,6 +195,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Main-loop-integration.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Main-loop-integration.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Main-loop-integration.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Main-loop-integration.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -143,7 +143,7 @@ application should wait indefinitely. This can also be 0 if Cogl needs to be woken up immediately.

    -

    Parameters

    +

    Parameters

    @@ -178,7 +178,7 @@
    -

    Returns

    +

    Returns

    A "poll fd state age" that changes whenever the set of poll_fds has changed. If this API is being used to integrate with another system mainloop api then @@ -222,7 +222,7 @@ manually then you can easily get a CoglRenderer pointer by calling cogl_get_renderer().

    -

    Parameters

    +

    Parameters

    @@ -288,7 +288,7 @@ cogl_glib_renderer_source_new()
    -

    Parameters

    +

    Parameters

    @@ -310,7 +310,7 @@
    -

    Returns

    +

    Returns

    a new GSource

    Since: 1.10

    @@ -342,7 +342,7 @@ is called the GSource should be attached to the main loop using g_source_attach().

    -

    Parameters

    +

    Parameters

    @@ -364,7 +364,7 @@
    -

    Returns

    +

    Returns

    a new GSource

    Since: 1.16

    @@ -393,7 +393,7 @@ corresponding defines for the poll function call on Unix so they may be directly passed to poll.

    -

    Members

    +

    Members

    @@ -483,7 +483,7 @@

    Note that CoglPollFD is deliberately exactly the same as struct pollfd on Unix so that it can simply be cast when calling poll.

    -

    Members

    +

    Members

    @@ -528,6 +528,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Matrices.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Matrices.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Matrices.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Matrices.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -286,7 +286,7 @@

    -

    Parameters

    +

    Parameters

    @@ -311,7 +311,7 @@ with the contents of array

    -

    Parameters

    +

    Parameters

    @@ -361,7 +361,7 @@

    -

    Parameters

    +

    Parameters

    @@ -403,7 +403,7 @@

    Initializes matrix from a CoglQuaternion rotation.

    -

    Parameters

    +

    Parameters

    @@ -434,7 +434,7 @@

    Initializes matrix from a CoglEuler rotation.

    -

    Parameters

    +

    Parameters

    @@ -465,7 +465,7 @@ the same values as matrix .

    -

    Parameters

    +

    Parameters

    @@ -480,7 +480,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglMatrix which should be freed using cogl_matrix_free().

    [transfer full]

    @@ -498,7 +498,7 @@ annotations associated with them and may potentially have a cached inverse matrix these are not considered in the comparison.

    -

    Parameters

    +

    Parameters

    @@ -529,7 +529,7 @@

    Frees a CoglMatrix that was previously allocated via a call to cogl_matrix_copy().

    -

    Parameters

    +

    Parameters

    @@ -559,7 +559,7 @@

    Multiplies matrix by the given frustum perspective matrix.

    -

    Parameters

    +

    Parameters

    @@ -624,7 +624,7 @@

    Multiplies matrix by a parallel projection matrix.

    -

    Parameters

    +

    Parameters

    @@ -706,7 +706,7 @@ since there wont be enough precision to identify the depth of objects near to each other.
    -

    Parameters

    +

    Parameters

    @@ -787,7 +787,7 @@
    Almost always when you use this function it should be the first transform applied to a new modelview transform
    -

    Parameters

    +

    Parameters

    @@ -877,7 +877,7 @@
    It is possible to multiply the a matrix in-place, so result can be equal to a but can't be equal to b.
    -

    Parameters

    +

    Parameters

    @@ -918,7 +918,7 @@ of angle degrees around the specified 3D vector.

    -

    Parameters

    +

    Parameters

    @@ -965,7 +965,7 @@ with a rotation transformation described by the given CoglQuaternion.

    -

    Parameters

    +

    Parameters

    @@ -998,7 +998,7 @@ with a rotation transformation described by the given CoglEuler.

    -

    Parameters

    +

    Parameters

    @@ -1033,7 +1033,7 @@ with a transform matrix that translates along the X, Y and Z axis.

    -

    Parameters

    +

    Parameters

    @@ -1077,7 +1077,7 @@ with a transform matrix that scales along the X, Y and Z axis.

    -

    Parameters

    +

    Parameters

    @@ -1118,7 +1118,7 @@ with its transpose. Ie, every element (i,j) in the new matrix is taken from element (j,i) in the old matrix.

    -

    Parameters

    +

    Parameters

    @@ -1142,7 +1142,7 @@

    Casts matrix to a float array which can be directly passed to OpenGL.

    -

    Parameters

    +

    Parameters

    @@ -1157,7 +1157,7 @@
    -

    Returns

    +

    Returns

    a pointer to the float array

    @@ -1175,7 +1175,7 @@ CoglMatrix so that subsequent requests for the inverse transform may avoid costly inversion calculations.
    -

    Parameters

    +

    Parameters

    @@ -1197,7 +1197,7 @@
    -

    Returns

    +

    Returns

    TRUE if the inverse was successfully calculated or FALSE for degenerate transformations that can't be inverted (in this case the inverse @@ -1217,7 +1217,7 @@

    Transforms a point whos position is given and returned as four float components.

    -

    Parameters

    +

    Parameters

    @@ -1330,7 +1330,7 @@

    -

    Parameters

    +

    Parameters

    @@ -1466,7 +1466,7 @@

    -

    Parameters

    +

    Parameters

    @@ -1535,7 +1535,7 @@ cogl_matrix_is_identity (const CoglMatrix *matrix);

    Determines if the given matrix is an identity matrix.

    -

    Parameters

    +

    Parameters

    @@ -1550,7 +1550,7 @@
    -

    Returns

    +

    Returns

    TRUE if matrix is an identity matrix else FALSE

    @@ -1622,6 +1622,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25
    \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Matrix-Stacks.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Matrix-Stacks.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Matrix-Stacks.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Matrix-Stacks.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -316,7 +316,7 @@ cogl_matrix_stack_rotate(), cogl_matrix_stack_scale() and cogl_matrix_stack_translate().

    -

    Parameters

    +

    Parameters

    @@ -331,7 +331,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglMatrixStack.

    [transfer full]

    @@ -348,7 +348,7 @@ called when going back up one layer to restore the previous transform of an ancestor.

    -

    Parameters

    +

    Parameters

    @@ -373,7 +373,7 @@

    This is usually called while traversing a scenegraph whenever you return up one level in the graph towards the root node.

    -

    Parameters

    +

    Parameters

    @@ -395,7 +395,7 @@ cogl_matrix_stack_load_identity (CoglMatrixStack *stack);

    Resets the current matrix to the identity matrix.

    -

    Parameters

    +

    Parameters

    @@ -421,7 +421,7 @@

    Multiplies the current matrix by one that scales the x, y and z axes by the given values.

    -

    Parameters

    +

    Parameters

    @@ -464,7 +464,7 @@

    Multiplies the current matrix by one that translates along all three axes according to the given values.

    -

    Parameters

    +

    Parameters

    @@ -514,7 +514,7 @@ the axis-vector (0, 0, 1) causes a small counter-clockwise rotation.

    -

    Parameters

    +

    Parameters

    @@ -561,7 +561,7 @@ rotation described by quaternion .

    -

    Parameters

    +

    Parameters

    @@ -593,7 +593,7 @@ rotation described by euler .

    -

    Parameters

    +

    Parameters

    @@ -623,7 +623,7 @@ const CoglMatrix *matrix);

    Multiplies the current matrix by the given matrix.

    -

    Parameters

    +

    Parameters

    @@ -660,7 +660,7 @@ viewing frustum defined by 4 side clip planes that all cross through the origin and 2 near and far clip planes.

    -

    Parameters

    +

    Parameters

    @@ -727,7 +727,7 @@ since there wont be enough precision to identify the depth of objects near to each other.
    -

    Parameters

    +

    Parameters

    @@ -778,7 +778,7 @@ float far);

    Replaces the current matrix with an orthographic projection matrix.

    -

    Parameters

    +

    Parameters

    @@ -838,7 +838,7 @@

    Gets the inverse transform of the current matrix and uses it to initialize a new CoglMatrix.

    -

    Parameters

    +

    Parameters

    @@ -860,7 +860,7 @@
    -

    Returns

    +

    Returns

    TRUE if the inverse was successfully calculated or FALSE for degenerate transformations that can't be inverted (in this case the inverse @@ -882,7 +882,7 @@ should call cogl_matrix_entry_unref() when you are finished with and entry you get via cogl_matrix_stack_get_entry().

    -

    Parameters

    +

    Parameters

    @@ -897,7 +897,7 @@
    -

    Returns

    +

    Returns

    A pointer to the CoglMatrixEntry representing the current matrix stack transform.

    [transfer none]

    @@ -927,7 +927,7 @@ matrix will be left untouched if a direct pointer is returned.
    -

    Parameters

    +

    Parameters

    @@ -949,7 +949,7 @@
    -

    Returns

    +

    Returns

    A direct pointer to the current transform or NULL and in that case matrix will be initialized with @@ -980,7 +980,7 @@ matrix will be left untouched if a direct pointer is returned.

    -

    Parameters

    +

    Parameters

    @@ -1003,7 +1003,7 @@
    -

    Returns

    +

    Returns

    A direct pointer to a CoglMatrix transform or NULL and in that case matrix will be initialized with @@ -1024,7 +1024,7 @@ since the last time cogl_matrix_stack_push() was called or since the stack was initialized.

    -

    Parameters

    +

    Parameters

    @@ -1065,7 +1065,7 @@

    If the difference between the two translations involves anything other than a translation then the function returns FALSE.

    -

    Parameters

    +

    Parameters

    @@ -1102,7 +1102,7 @@
    -

    Returns

    +

    Returns

    TRUE if the only difference between the transform of entry0 and the transform of entry1 @@ -1122,7 +1122,7 @@ matrix. If it returns FALSE it may or may not be the identity matrix but no expensive comparison is performed to verify it.

    -

    Parameters

    +

    Parameters

    @@ -1137,7 +1137,7 @@
    -

    Returns

    +

    Returns

    TRUE if entry is definitely an identity transform, otherwise FALSE.

    @@ -1155,7 +1155,7 @@ direct pointer comparisons of entries are good enough and much cheaper too.
    -

    Parameters

    +

    Parameters

    @@ -1177,7 +1177,7 @@
    -

    Returns

    +

    Returns

    TRUE if entry0 represents the same transform as entry1 @@ -1199,7 +1199,7 @@ pointer to cogl_object_ref() and cogl_object_unref()

    -

    Parameters

    +

    Parameters

    @@ -1224,7 +1224,7 @@ cogl_matrix_entry_unref() or to release the reference given when calling cogl_matrix_stack_get_entry().

    -

    Parameters

    +

    Parameters

    @@ -1306,6 +1306,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Offscreen-Framebuffers.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Offscreen-Framebuffers.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Offscreen-Framebuffers.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Offscreen-Framebuffers.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -85,7 +85,7 @@

    Determines whether the given CoglObject references an offscreen framebuffer object.

    -

    Parameters

    +

    Parameters

    @@ -100,7 +100,7 @@
    -

    Returns

    +

    Returns

    TRUE if object is a CoglOffscreen framebuffer, FALSE otherwise

    @@ -136,7 +136,7 @@ finished configuring it by calling cogl_framebuffer_allocate() and passing in a CoglError argument to catch any exceptions.

    -

    Parameters

    +

    Parameters

    @@ -151,7 +151,7 @@
    -

    Returns

    +

    Returns

    a newly instantiated CoglOffscreen framebuffer.

    [transfer full]

    @@ -167,6 +167,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25
    \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Path-Primitives.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Path-Primitives.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Path-Primitives.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Path-Primitives.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -43,6 +43,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25
    \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Pipeline.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Pipeline.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Pipeline.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Pipeline.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -193,10 +193,6 @@ -#define -COGL_BLEND_STRING_ERROR - - CoglBool @@ -528,6 +524,10 @@ CoglPipelineAlphaFunc +#define +COGL_BLEND_STRING_ERROR + + enum CoglBlendStringError @@ -569,7 +569,7 @@

    Allocates and initializes a default simple pipeline that will color a primitive white.

    -

    Parameters

    +

    Parameters

    @@ -584,7 +584,7 @@
    -

    Returns

    +

    Returns

    a pointer to a new CoglPipeline.

    [transfer full]

    @@ -617,7 +617,7 @@ keep track of a pipelines ancestry which we may use to help minimize GPU state changes.

    -

    Parameters

    +

    Parameters

    @@ -632,7 +632,7 @@
    -

    Returns

    +

    Returns

    a pointer to the newly allocated CoglPipeline.

    [transfer full]

    @@ -660,7 +660,7 @@

    Gets whether the given object references an existing pipeline object.

    -

    Parameters

    +

    Parameters

    @@ -675,7 +675,7 @@
    -

    Returns

    +

    Returns

    TRUE if the object references a CoglPipeline, FALSE otherwise

    @@ -709,7 +709,7 @@ semi-transparent red. See cogl_color_premultiply().

    The default value is (1.0, 1.0, 1.0, 1.0)

    -

    Parameters

    +

    Parameters

    @@ -758,7 +758,7 @@

    Sets the basic color of the pipeline, used when no lighting is enabled.

    The default value is (0xff, 0xff, 0xff, 0xff)

    -

    Parameters

    +

    Parameters

    @@ -822,7 +822,7 @@

    Sets the basic color of the pipeline, used when no lighting is enabled.

    The default value is (1.0, 1.0, 1.0, 1.0)

    -

    Parameters

    +

    Parameters

    @@ -882,7 +882,7 @@ CoglColor *color);

    Retrieves the current pipeline color.

    -

    Parameters

    +

    Parameters

    @@ -932,7 +932,7 @@ slant.

    The default value is (0.2, 0.2, 0.2, 1.0)

    -

    Parameters

    +

    Parameters

    @@ -978,7 +978,7 @@

    Retrieves the current ambient color for pipeline

    -

    Parameters

    +

    Parameters

    @@ -1026,7 +1026,7 @@ surface directly - perpendicular to the surface.

    The default value is (0.8, 0.8, 0.8, 1.0)

    -

    Parameters

    +

    Parameters

    @@ -1072,7 +1072,7 @@

    Retrieves the current diffuse color for pipeline

    -

    Parameters

    +

    Parameters

    @@ -1121,7 +1121,7 @@

    The default ambient color is (0.2, 0.2, 0.2, 1.0)

    The default diffuse color is (0.8, 0.8, 0.8, 1.0)

    -

    Parameters

    +

    Parameters

    @@ -1169,7 +1169,7 @@ color.

    The default value is (0.0, 0.0, 0.0, 1.0)

    -

    Parameters

    +

    Parameters

    @@ -1214,7 +1214,7 @@ CoglColor *emission);

    Retrieves the pipelines current emission color.

    -

    Parameters

    +

    Parameters

    @@ -1262,7 +1262,7 @@ position, and is brightest along the lines of reflection.

    The default value is (0.0, 0.0, 0.0, 1.0)

    -

    Parameters

    +

    Parameters

    @@ -1307,7 +1307,7 @@ CoglColor *specular);

    Retrieves the pipelines current specular color.

    -

    Parameters

    +

    Parameters

    @@ -1357,7 +1357,7 @@ object appear more shiny.

    The default value is 0.0

    -

    Parameters

    +

    Parameters

    @@ -1401,7 +1401,7 @@ cogl_pipeline_get_shininess (CoglPipeline *pipeline);

    Retrieves the pipelines current emission color.

    -

    Parameters

    +

    Parameters

    @@ -1416,7 +1416,7 @@
    -

    Returns

    +

    Returns

    The pipelines current shininess value

    Since: 2.0

    @@ -1449,7 +1449,7 @@ and which continue on to the blending stage.

    The default is COGL_PIPELINE_ALPHA_FUNC_ALWAYS

    -

    Parameters

    +

    Parameters

    @@ -1495,14 +1495,6 @@
    -

    COGL_BLEND_STRING_ERROR

    -
    #define COGL_BLEND_STRING_ERROR (cogl_blend_string_error_quark ())
-
    -

    CoglError domain for blend string parser errors

    -

    Since: 1.0

    -
    -
    -

    cogl_pipeline_set_blend ()

    CoglBool
 cogl_pipeline_set_blend (CoglPipeline *pipeline,
@@ -1581,7 +1573,7 @@
 
    That gives normal alpha-blending when the calculated color for the pipeline
 is in premultiplied form.
    
 
    
-
    Parameters
    
+
    Parameters
    @@ -1614,7 +1606,7 @@
    -

    Returns

    +

    Returns

    TRUE if the blend string was successfully parsed, and the described blending is supported by the underlying driver/hardware. If there was an error, FALSE is returned and error @@ -1646,7 +1638,7 @@

    When blending is setup to reference a CONSTANT blend factor then blending will depend on the constant set with this function.

    -

    Parameters

    +

    Parameters

    @@ -1701,7 +1693,7 @@ if an application wants to draw points it must make sure to use a pipeline that has an explicit point size set on it.

    -

    Parameters

    +

    Parameters

    @@ -1746,7 +1738,7 @@

    Get the size of points drawn when COGL_VERTICES_MODE_POINTS is used with the vertex buffer API.

    -

    Parameters

    +

    Parameters

    @@ -1761,7 +1753,7 @@
    -

    Returns

    +

    Returns

    the point size of the pipeline .

    @@ -1803,7 +1795,7 @@ this is not available then the function will return FALSE and set a CoglError.

    -

    Parameters

    +

    Parameters

    @@ -1830,7 +1822,7 @@
    -

    Returns

    +

    Returns

    TRUE if the change suceeded or FALSE otherwise

    Since: 2.0

    @@ -1856,7 +1848,7 @@ cogl_pipeline_get_per_vertex_point_size (CoglPipeline *pipeline);
    -

    Parameters

    +

    Parameters

    @@ -1871,7 +1863,7 @@
    -

    Returns

    +

    Returns

    TRUE if the pipeline has per-vertex point size enabled or FALSE otherwise. The per-vertex point size can be enabled with cogl_pipeline_set_per_vertex_point_size().

    @@ -1901,7 +1893,7 @@ current framebuffer. Each bit set in the mask means that the corresponding color would be written.

    -

    Parameters

    +

    Parameters

    @@ -1916,7 +1908,7 @@
    -

    Returns

    +

    Returns

    A CoglColorMask

    Since: 1.8

    @@ -1946,7 +1938,7 @@ that means that color will be written.

    -

    Parameters

    +

    Parameters

    @@ -2001,7 +1993,7 @@ it is possible for this function to fail and report an error .

    -

    Parameters

    +

    Parameters

    @@ -2029,7 +2021,7 @@
    -

    Returns

    +

    Returns

    TRUE if the GPU supports all the given state else FALSE and returns an error @@ -2061,7 +2053,7 @@ pipeline as previously set using cogl_pipeline_set_depth_state().

    -

    Parameters

    +

    Parameters

    @@ -2117,7 +2109,7 @@ cogl_pipeline_set_front_face_winding().

    Status: Unstable

    -

    Parameters

    +

    Parameters

    @@ -2155,7 +2147,7 @@ COGL_WINDING_COUNTER_CLOCKWISE.

    Status: Unstable

    -

    Parameters

    +

    Parameters

    @@ -2204,7 +2196,7 @@ specify the texture type so that any pipeline copies can share the internal texture type state for efficiency.

    -

    Parameters

    +

    Parameters

    @@ -2253,7 +2245,7 @@ cogl_pipeline_get_layer_texture (CoglPipeline *pipeline, int layer_index);
    -

    Parameters

    +

    Parameters

    @@ -2275,7 +2267,7 @@
    -

    Returns

    +

    Returns

    the texture that was set for the given layer of the pipeline or NULL if no texture was set.

    [transfer none]

    @@ -2311,7 +2303,7 @@ magnification filters since magnification doesn't ever need to reference values stored in the mipmap chain.
    -

    Parameters

    +

    Parameters

    @@ -2370,7 +2362,7 @@

    The default filter is COGL_PIPELINE_FILTER_LINEAR but this can be changed using cogl_pipeline_set_layer_filters().

    -

    Parameters

    +

    Parameters

    @@ -2392,7 +2384,7 @@
    -

    Returns

    +

    Returns

    The minification CoglPipelineFilter for the specified layer.

    @@ -2424,7 +2416,7 @@

    The default filter is COGL_PIPELINE_FILTER_LINEAR but this can be changed using cogl_pipeline_set_layer_filters().

    -

    Parameters

    +

    Parameters

    @@ -2446,7 +2438,7 @@
    -

    Returns

    +

    Returns

    The magnification CoglPipelineFilter for the specified layer.

    @@ -2479,7 +2471,7 @@ cogl_pipeline_set_layer_wrap_mode_t() and cogl_pipeline_set_layer_wrap_mode_p() separately.

    -

    Parameters

    +

    Parameters

    @@ -2530,7 +2522,7 @@ CoglPipelineWrapMode mode);

    Sets the wrap mode for the 's' coordinate of texture lookups on this layer.

    -

    Parameters

    +

    Parameters

    @@ -2581,7 +2573,7 @@ CoglPipelineWrapMode mode);

    Sets the wrap mode for the 't' coordinate of texture lookups on this layer.

    -

    Parameters

    +

    Parameters

    @@ -2633,7 +2625,7 @@

    Sets the wrap mode for the 'p' coordinate of texture lookups on this layer. 'p' is the third coordinate.

    -

    Parameters

    +

    Parameters

    @@ -2777,7 +2769,7 @@
    You can't give a multiplication factor for arguments as you can with blending.
    -

    Parameters

    +

    Parameters

    @@ -2812,7 +2804,7 @@
    -

    Returns

    +

    Returns

    TRUE if the blend string was successfully parsed, and the described texture combining is supported by the underlying driver and or hardware. On failure, FALSE is returned and error @@ -2845,7 +2837,7 @@

    When you are using the 'CONSTANT' color source in a layer combine description then you can use this function to define its value.

    -

    Parameters

    +

    Parameters

    @@ -2898,7 +2890,7 @@

    This function lets you set a matrix that can be used to e.g. translate and rotate a single layer of a pipeline used to fill your geometry.

    -

    Parameters

    +

    Parameters

    @@ -2963,7 +2955,7 @@ return FALSE and set error .

    -

    Parameters

    +

    Parameters

    @@ -2995,7 +2987,7 @@
    -

    Returns

    +

    Returns

    TRUE if the function succeeds, FALSE otherwise.

    Since: 2.0

    @@ -3024,7 +3016,7 @@

    Gets whether point sprite coordinate generation is enabled for this texture layer.

    -

    Parameters

    +

    Parameters

    @@ -3046,7 +3038,7 @@
    -

    Returns

    +

    Returns

    whether the texture coordinates will be replaced with point sprite coordinates.

    @@ -3074,7 +3066,7 @@ int layer_index);

    This function removes a layer from your pipeline

    -

    Parameters

    +

    Parameters

    @@ -3119,7 +3111,7 @@

    Retrieves the number of layers defined for the given pipeline

    -

    Parameters

    +

    Parameters

    @@ -3134,7 +3126,7 @@
    -

    Returns

    +

    Returns

    the number of layers

    Since: 2.0

    @@ -3164,7 +3156,7 @@ iterating all the layers of a pipeline .

    -

    Parameters

    +

    Parameters

    @@ -3216,7 +3208,7 @@

    Iterates all the layer indices of the given pipeline .

    -

    Parameters

    +

    Parameters

    @@ -3276,7 +3268,7 @@ present. It is not necessary to set the program on the pipeline before calling this function.

    -

    Parameters

    +

    Parameters

    @@ -3298,7 +3290,7 @@
    -

    Returns

    +

    Returns

    A integer representing the location of the given uniform.

    Since: 2.0

    @@ -3336,7 +3328,7 @@ float. It can also be used to set a single member of a float array uniform.

    -

    Parameters

    +

    Parameters

    @@ -3397,7 +3389,7 @@ int. It can also be used to set a single member of a int array uniform or a sampler uniform.

    -

    Parameters

    +

    Parameters

    @@ -3466,7 +3458,7 @@ and 8 for count .

    -

    Parameters

    +

    Parameters

    @@ -3545,7 +3537,7 @@ and 8 for count .

    -

    Parameters

    +

    Parameters

    @@ -3632,7 +3624,7 @@ transpose to FALSE.

    -

    Parameters

    +

    Parameters

    @@ -3702,7 +3694,7 @@ . Note that some hook points are specific to a layer and must be added with cogl_pipeline_add_layer_snippet() instead.

    -

    Parameters

    +

    Parameters

    @@ -3752,7 +3744,7 @@ cogl_snippet_new(). Note that some hooks can't be used with a layer and need to be added with cogl_pipeline_add_snippet() instead.

    -

    Parameters

    +

    Parameters

    @@ -3809,7 +3801,7 @@ incoming alpha value and a reference alpha value. The CoglPipelineAlphaFunc determines how the comparison is done.

    -

    Members

    +

    Members

    @@ -3885,10 +3877,18 @@
    +

    COGL_BLEND_STRING_ERROR

    +
    #define COGL_BLEND_STRING_ERROR (cogl_blend_string_error_quark ())
+
    +

    CoglError domain for blend string parser errors

    +

    Since: 1.0

    +
    +
    +

    enum CoglBlendStringError

    Error enumeration for the blend strings parser

    -

    Members

    +

    Members

    @@ -3936,7 +3936,7 @@

    Specifies which faces should be culled. This can be set on a pipeline using cogl_pipeline_set_cull_face_mode().

    -

    Members

    +

    Members

    @@ -3984,7 +3984,7 @@ used to set the front face for culling by calling cogl_pipeline_set_front_face_winding().

    -

    Members

    +

    Members

    @@ -4019,7 +4019,7 @@ possibly referring to multiple neighbouring texels and taking a weighted average or simply using the nearest texel.

    -

    Members

    +

    Members

    @@ -4097,7 +4097,7 @@ artifacts around the edges when the pixels from the other side are merged in if the wrap mode is set to repeat.

    -

    Members

    +

    Members

    @@ -4150,6 +4150,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Primitives.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Primitives.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Primitives.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Primitives.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -270,7 +270,7 @@ cogl_primitive_set_n_vertices() were called. This property defines the number of vertices to read when drawing.

    -

    Parameters

    +

    Parameters

    @@ -297,7 +297,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglPrimitive object.

    [transfer full]

    @@ -335,7 +335,7 @@ cogl_primitive_set_n_vertices() were called. This property defines the number of vertices to read when drawing.

    -

    Parameters

    +

    Parameters

    @@ -367,7 +367,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglPrimitive object.

    [transfer full]

    @@ -444,7 +444,7 @@ 1.1) then you will need to make sure your assets are resized to a power-of-two size (though they don't have to be square)
    -

    Parameters

    +

    Parameters

    @@ -479,7 +479,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglPrimitive with a reference of 1. This can be freed using cogl_object_unref().

    [transfer full]

    @@ -557,7 +557,7 @@ 1.1) then you will need to make sure your assets are resized to a power-of-two size (though they don't have to be square)
    -

    Parameters

    +

    Parameters

    @@ -592,7 +592,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglPrimitive with a reference of 1. This can be freed using cogl_object_unref().

    [transfer full]

    @@ -672,7 +672,7 @@ 1.1) then you will need to make sure your assets are resized to a power-of-two size (though they don't have to be square)
    -

    Parameters

    +

    Parameters

    @@ -707,7 +707,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglPrimitive with a reference of 1. This can be freed using cogl_object_unref().

    [transfer full]

    @@ -787,7 +787,7 @@ 1.1) then you will need to make sure your assets are resized to a power-of-two size (though they don't have to be square)
    -

    Parameters

    +

    Parameters

    @@ -822,7 +822,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglPrimitive with a reference of 1. This can be freed using cogl_object_unref().

    [transfer full]

    @@ -902,7 +902,7 @@ 1.1) then you will need to make sure your assets are resized to a power-of-two size (though they don't have to be square)
    -

    Parameters

    +

    Parameters

    @@ -937,7 +937,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglPrimitive with a reference of 1. This can be freed using cogl_object_unref().

    [transfer full]

    @@ -1017,7 +1017,7 @@ 1.1) then you will need to make sure your assets are resized to a power-of-two size (though they don't have to be square)
    -

    Parameters

    +

    Parameters

    @@ -1052,7 +1052,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglPrimitive with a reference of 1. This can be freed using cogl_object_unref().

    [transfer full]

    @@ -1132,7 +1132,7 @@ 1.1) then you will need to make sure your assets are resized to a power-of-two size (though they don't have to be square)
    -

    Parameters

    +

    Parameters

    @@ -1167,7 +1167,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglPrimitive with a reference of 1. This can be freed using cogl_object_unref().

    [transfer full]

    @@ -1247,7 +1247,7 @@ 1.1) then you will need to make sure your assets are resized to a power-of-two size (though they don't have to be square)
    -

    Parameters

    +

    Parameters

    @@ -1282,7 +1282,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglPrimitive with a reference of 1. This can be freed using cogl_object_unref().

    [transfer full]

    @@ -1310,7 +1310,7 @@ cogl_is_primitive (void *object);

    Gets whether the given object references a CoglPrimitive.

    -

    Parameters

    +

    Parameters

    @@ -1325,7 +1325,7 @@
    -

    Returns

    +

    Returns

    TRUE if the object references a CoglPrimitive, FALSE otherwise

    @@ -1377,7 +1377,7 @@ terms of data - associated with the primitive it's just the number of vertices to read and draw.
    -

    Parameters

    +

    Parameters

    @@ -1392,7 +1392,7 @@
    -

    Returns

    +

    Returns

    The number of vertices to read when drawing.

    Since: 1.8

    @@ -1426,7 +1426,7 @@ terms of data - associated with the primitive it's just the number of vertices to read and draw.
    -

    Parameters

    +

    Parameters

    @@ -1485,7 +1485,7 @@ int n_attributes);

    Replaces all the attributes of the given CoglPrimitive object.

    -

    Parameters

    +

    Parameters

    @@ -1534,7 +1534,7 @@ 
    CoglIndices *
 cogl_primitive_get_indices (CoglPrimitive *primitive);
    -

    Parameters

    +

    Parameters

    @@ -1549,7 +1549,7 @@
    -

    Returns

    +

    Returns

    the indices that were set with cogl_primitive_set_indices() or NULL if no indices were set.

    [transfer none]

    @@ -1596,7 +1596,7 @@ also affects drawing with indices by defining the first entry of the indices to start drawing from.
    -

    Parameters

    +

    Parameters

    @@ -1647,7 +1647,7 @@ is a shallow copy which means it will use the same attributes and attribute buffers as the original primitive.

    -

    Parameters

    +

    Parameters

    @@ -1662,7 +1662,7 @@
    -

    Returns

    +

    Returns

    the new primitive.

    [transfer full]

    @@ -1694,7 +1694,7 @@

    The function should return TRUE to continue iteration or FALSE to stop.

    -

    Parameters

    +

    Parameters

    @@ -1745,7 +1745,7 @@ void *user_data);

    Iterates all the attributes of the given CoglPrimitive.

    -

    Parameters

    +

    Parameters

    @@ -1808,7 +1808,7 @@ are associated with layers of the given pipeline .

    -

    Parameters

    +

    Parameters

    @@ -1860,6 +1860,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Quaternions-(Rotations).html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Quaternions-(Rotations).html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Quaternions-(Rotations).html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Quaternions-(Rotations).html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -269,7 +269,7 @@

    You might also want to consider using cogl_get_static_identity_quaternion().

    -

    Parameters

    +

    Parameters

    @@ -302,7 +302,7 @@ ). The axis vector does not need to be normalized.

    -

    Parameters

    +

    Parameters

    @@ -342,7 +342,7 @@
    -

    Returns

    +

    Returns

    A normalized, unit quaternion representing an orientation rotated angle degrees around the axis vector (x @@ -359,7 +359,7 @@ cogl_quaternion_init_from_quaternion (CoglQuaternion *quaternion, CoglQuaternion *src);

    -

    Parameters

    +

    Parameters

    @@ -397,7 +397,7 @@ vector. The axis vector does not need to be normalized.

    -

    Parameters

    +

    Parameters

    @@ -425,7 +425,7 @@
    -

    Returns

    +

    Returns

    A normalized, unit quaternion representing an orientation rotated angle degrees around the given axis @@ -442,7 +442,7 @@

    Initializes a [w (x, y,z)] quaternion directly from an array of 4 floats: [w,x,y,z].

    -

    Parameters

    +

    Parameters

    @@ -473,7 +473,7 @@ float angle);

    XXX: check which direction this rotates

    -

    Parameters

    +

    Parameters

    @@ -503,7 +503,7 @@ cogl_quaternion_init_from_y_rotation (CoglQuaternion *quaternion, float angle);
    -

    Parameters

    +

    Parameters

    @@ -533,7 +533,7 @@ cogl_quaternion_init_from_z_rotation (CoglQuaternion *quaternion, float angle);
    -

    Parameters

    +

    Parameters

    @@ -563,7 +563,7 @@ cogl_quaternion_init_from_euler (CoglQuaternion *quaternion, const CoglEuler *euler);
    -

    Parameters

    +

    Parameters

    @@ -600,7 +600,7 @@ the == operator is at least used so that 0 and -0 are considered equal.

    -

    Parameters

    +

    Parameters

    @@ -622,7 +622,7 @@
    -

    Returns

    +

    Returns

    TRUE if the quaternions are equal else FALSE.

    Since: 2.0

    @@ -636,7 +636,7 @@ the same values as src .

    -

    Parameters

    +

    Parameters

    @@ -651,7 +651,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglQuaternion which should be freed using cogl_quaternion_free()

    @@ -665,7 +665,7 @@

    Frees a CoglQuaternion that was previously allocated via cogl_quaternion_copy().

    -

    Parameters

    +

    Parameters

    @@ -687,7 +687,7 @@ 
    float
 cogl_quaternion_get_rotation_angle (const CoglQuaternion *quaternion);
    -

    Parameters

    +

    Parameters

    @@ -710,7 +710,7 @@ cogl_quaternion_get_rotation_axis (const CoglQuaternion *quaternion, float *vector3);
    -

    Parameters

    +

    Parameters

    @@ -739,7 +739,7 @@ 
    void
 cogl_quaternion_normalize (CoglQuaternion *quaternion);
    -

    Parameters

    +

    Parameters

    @@ -762,7 +762,7 @@ cogl_quaternion_dot_product (const CoglQuaternion *a, const CoglQuaternion *b);
    -

    Parameters

    +

    Parameters

    @@ -791,7 +791,7 @@ 
    void
 cogl_quaternion_invert (CoglQuaternion *quaternion);
    -

    Parameters

    +

    Parameters

    @@ -825,7 +825,7 @@
    It is possible to multiply the a quaternion in-place, so result can be equal to a but can't be equal to b.
    -

    Parameters

    +

    Parameters

    @@ -860,7 +860,7 @@ cogl_quaternion_pow (CoglQuaternion *quaternion, float exponent);
    -

    Parameters

    +

    Parameters

    @@ -908,7 +908,7 @@
    -

    Parameters

    +

    Parameters

    @@ -977,7 +977,7 @@
    -

    Parameters

    +

    Parameters

    @@ -1023,7 +1023,7 @@ const CoglQuaternion *next, float t);
    -

    Parameters

    +

    Parameters

    @@ -1081,7 +1081,7 @@

    If you multiply a quaternion with the identity quaternion you will get back the same value as the original quaternion.

    -

    Returns

    +

    Returns

    A pointer to an identity quaternion

    Since: 2.0

    @@ -1092,7 +1092,7 @@ 
    const CoglQuaternion *
 cogl_get_static_zero_quaternion (void);
    -

    Returns

    +

    Returns

    a pointer to a singleton quaternion constant describing a rotation of 180 degrees around a degenerate axis: [0 (0, 0, 0)]

    @@ -1178,7 +1178,7 @@
  • http://www.j3d.org/matrix_faq/matrfaq_latest.html#Q56
    • -

    Members

    +

    Members

    @@ -1216,6 +1216,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Rectangles.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Rectangles.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Rectangles.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Rectangles.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -96,7 +96,7 @@ float y_2);

    Fills a rectangle at the given coordinates with the current source material

    -

    Parameters

    +

    Parameters

    @@ -145,7 +145,7 @@ parameters x1, y1, x2, and y2, and have the same meaning as in cogl_rectangle().

    -

    Parameters

    +

    Parameters

    @@ -188,7 +188,7 @@ =1.0 ty2 =1.0.

    -

    Parameters

    +

    Parameters

    @@ -258,7 +258,7 @@ parameters x1, y1, x2, y2, tx1, ty1, tx2 and ty2 and have the same meaning as in cogl_rectangle_with_texture_coords().

    -

    Parameters

    +

    Parameters

    @@ -301,7 +301,7 @@ layers in the current source material then default texture coordinates (0.0, 0.0, 1.0, 1.0) are generated.

    -

    Parameters

    +

    Parameters

    @@ -356,6 +356,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Rectangle-textures-(non-normalized-coordinates).html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Rectangle-textures-(non-normalized-coordinates).html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Rectangle-textures-(non-normalized-coordinates).html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Rectangle-textures-(non-normalized-coordinates).html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -134,7 +134,7 @@

    Returns value: (transfer full): A pointer to a new CoglTextureRectangle object with no storage allocated yet.

    -

    Parameters

    +

    Parameters

    @@ -205,7 +205,7 @@ how the texture is going to be used and can optimize how it is allocated.

    -

    Parameters

    +

    Parameters

    @@ -220,7 +220,7 @@
    -

    Returns

    +

    Returns

    A pointer to a new CoglTextureRectangle texture.

    [transfer full]

    @@ -249,7 +249,7 @@

    Gets whether the given object references an existing CoglTextureRectangle object.

    -

    Parameters

    +

    Parameters

    @@ -264,7 +264,7 @@
    -

    Returns

    +

    Returns

    TRUE if the object references a CoglTextureRectangle, FALSE otherwise.

    @@ -279,6 +279,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25
    \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-SDL-Integration.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-SDL-Integration.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-SDL-Integration.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-SDL-Integration.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -239,7 +239,7 @@ to manually create a CoglRenderer and call cogl_sdl_renderer_set_event_type().
    -

    Parameters

    +

    Parameters

    @@ -294,7 +294,7 @@ CoglRenderer and CoglDisplay objects during initialization.
    -

    Parameters

    +

    Parameters

    @@ -343,7 +343,7 @@ cogl_sdl_context_new or by using cogl_sdl_renderer_set_event_type().

    -

    Parameters

    +

    Parameters

    @@ -384,7 +384,7 @@ . This function must be called for every SDL event.

    -

    Parameters

    +

    Parameters

    @@ -430,7 +430,7 @@ SDL_WaitEvent(). Cogl may use this to run low priority book keeping tasks.

    -

    Parameters

    +

    Parameters

    @@ -466,7 +466,7 @@ 
    SDL_Window *
 cogl_sdl_onscreen_get_window (CoglOnscreen *onscreen);
    -

    Parameters

    +

    Parameters

    @@ -481,7 +481,7 @@
    -

    Returns

    +

    Returns

    the underlying SDL_Window associated with an onscreen framebuffer.

    Since: 2.0

    @@ -506,6 +506,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25
    \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Shader-snippets.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Shader-snippets.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Shader-snippets.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Shader-snippets.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -389,7 +389,7 @@ const char *post);

    Allocates and initializes a new snippet with the given source strings.

    -

    Parameters

    +

    Parameters

    @@ -419,7 +419,7 @@
    -

    Returns

    +

    Returns

    a pointer to a new CoglSnippet

    Since: 1.10

    @@ -444,7 +444,7 @@ 
    CoglSnippetHook
 cogl_snippet_get_hook (CoglSnippet *snippet);
    -

    Parameters

    +

    Parameters

    @@ -459,7 +459,7 @@
    -

    Returns

    +

    Returns

    the hook that was set when cogl_snippet_new() was called.

    @@ -487,7 +487,7 @@

    Gets whether the given object references an existing snippet object.

    -

    Parameters

    +

    Parameters

    @@ -502,7 +502,7 @@
    -

    Returns

    +

    Returns

    TRUE if the object references a CoglSnippet, FALSE otherwise

    @@ -537,7 +537,7 @@ to its first pipeline. After that the snippet should be considered immutable.

    -

    Parameters

    +

    Parameters

    @@ -581,7 +581,7 @@ 
    const char *
 cogl_snippet_get_declarations (CoglSnippet *snippet);
    -

    Parameters

    +

    Parameters

    @@ -596,7 +596,7 @@
    -

    Returns

    +

    Returns

    the source string that was set with cogl_snippet_set_declarations() or NULL if none was set.

    @@ -630,7 +630,7 @@ to its first pipeline. After that the snippet should be considered immutable.

    -

    Parameters

    +

    Parameters

    @@ -673,7 +673,7 @@ 
    const char *
 cogl_snippet_get_pre (CoglSnippet *snippet);
    -

    Parameters

    +

    Parameters

    @@ -688,7 +688,7 @@
    -

    Returns

    +

    Returns

    the source string that was set with cogl_snippet_set_pre() or NULL if none was set.

    @@ -722,7 +722,7 @@ to its first pipeline. After that the snippet should be considered immutable.

    -

    Parameters

    +

    Parameters

    @@ -765,7 +765,7 @@ 
    const char *
 cogl_snippet_get_replace (CoglSnippet *snippet);
    -

    Parameters

    +

    Parameters

    @@ -780,7 +780,7 @@
    -

    Returns

    +

    Returns

    the source string that was set with cogl_snippet_set_replace() or NULL if none was set.

    @@ -814,7 +814,7 @@ to its first pipeline. After that the snippet should be considered immutable.

    -

    Parameters

    +

    Parameters

    @@ -857,7 +857,7 @@ 
    const char *
 cogl_snippet_get_post (CoglSnippet *snippet);
    -

    Parameters

    +

    Parameters

    @@ -872,7 +872,7 @@
    -

    Returns

    +

    Returns

    the source string that was set with cogl_snippet_set_post() or NULL if none was set.

    @@ -1157,7 +1157,7 @@
    -

    Members

    +

    Members

    @@ -1262,6 +1262,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Sliced-Textures.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Sliced-Textures.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Sliced-Textures.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Sliced-Textures.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -154,7 +154,7 @@ is larger than is supported by the hardware but slicing is disabled the texture size would be too large to handle.
    -

    Parameters

    +

    Parameters

    @@ -189,7 +189,7 @@
    -

    Returns

    +

    Returns

    A new CoglTexture2DSliced object with no storage allocated yet.

    [transfer full]

    @@ -243,7 +243,7 @@ larger than is supported by the hardware but slicing is disabled the texture size would be too large to handle.
    -

    Parameters

    +

    Parameters

    @@ -278,7 +278,7 @@
    -

    Returns

    +

    Returns

    A newly created CoglTexture2DSliced or NULL on failure and error will be updated.

    @@ -331,7 +331,7 @@ supported by the hardware but slicing is disabled the texture size would be too large to handle.
    -

    Parameters

    +

    Parameters

    @@ -392,7 +392,7 @@
    -

    Returns

    +

    Returns

    A newly created CoglTexture2DSliced or NULL on failure and error will be updated.

    @@ -433,7 +433,7 @@ larger than is supported by the hardware but slicing is disabled the texture size would be too large to handle.
    -

    Parameters

    +

    Parameters

    @@ -458,7 +458,7 @@
    -

    Returns

    +

    Returns

    A newly created CoglTexture2DSliced or NULL on failure and error will be updated.

    @@ -473,7 +473,7 @@ cogl_is_texture_2d_sliced (void *object);

    Gets whether the given object references a CoglTexture2DSliced.

    -

    Parameters

    +

    Parameters

    @@ -488,7 +488,7 @@
    -

    Returns

    +

    Returns

    TRUE if the object references a CoglTexture2DSliced and FALSE otherwise.

    @@ -518,6 +518,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25
    \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Sub-Textures.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Sub-Textures.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Sub-Textures.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Sub-Textures.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -101,7 +101,7 @@ CoglMetaTexture interface to resolve a CoglSubTexture into a low-level texture before drawing.
    -

    Parameters

    +

    Parameters

    @@ -147,7 +147,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglSubTexture representing a sub-region of parent_texture .

    @@ -177,7 +177,7 @@

    Checks whether object is a CoglSubTexture.

    -

    Parameters

    +

    Parameters

    @@ -192,7 +192,7 @@
    -

    Returns

    +

    Returns

    TRUE if the passed object represents a CoglSubTexture and FALSE otherwise.

    @@ -223,6 +223,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25
    \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Object-Interface.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Object-Interface.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Object-Interface.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Object-Interface.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -110,7 +110,7 @@ by 1

    [skip]

    -

    Parameters

    +

    Parameters

    @@ -125,7 +125,7 @@
    -

    Returns

    +

    Returns

    the object , with its reference count increased

    @@ -141,7 +141,7 @@ will be freed

    [skip]

    -

    Parameters

    +

    Parameters

    @@ -171,7 +171,7 @@ this function returns NULL.

    [skip]

    -

    Parameters

    +

    Parameters

    @@ -194,7 +194,7 @@
    -

    Returns

    +

    Returns

    The user data previously associated with object using the given key @@ -220,7 +220,7 @@ .

    [skip]

    -

    Parameters

    +

    Parameters

    @@ -324,7 +324,7 @@

    -

    Members

    +

    Members

    @@ -354,6 +354,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Texture-Interface.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Texture-Interface.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Texture-Interface.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Texture-Interface.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -48,10 +48,6 @@ - - - - @@ -153,6 +149,10 @@ + + + + @@ -181,7 +181,7 @@ cogl_is_texture (void *object);

    Gets whether the given object references a texture object.

    -

    Parameters

    +

    Parameters

    #defineCOGL_TEXTURE_ERROR
    CoglBool CoglTexture
    #defineCOGL_TEXTURE_ERROR
    enum CoglTextureError
    @@ -196,7 +196,7 @@
    -

    Returns

    +

    Returns

    TRUE if the object references a texture, and FALSE otherwise

    @@ -204,28 +204,6 @@
    -

    COGL_TEXTURE_ERROR

    -
    #define COGL_TEXTURE_ERROR (cogl_texture_error_quark ())
-
    -

    CoglError domain for texture errors.

    -

    Since: 1.8

    -

    Stability Level: Unstable

    -
    -
    -

    cogl_texture_allocate ()

    CoglBool
 cogl_texture_allocate (CoglTexture *texture,
@@ -239,7 +217,7 @@
 the texture, or if the texture is attached to a CoglOffscreen
 framebuffer and rendered too.
    -

    Parameters

    +

    Parameters

    @@ -261,7 +239,7 @@
    -

    Returns

    +

    Returns

    TRUE if the texture was successfully allocated, otherwise FALSE and error will be updated if it @@ -275,7 +253,7 @@ cogl_texture_get_width (CoglTexture *texture);

    Queries the width of a cogl texture.

    -

    Parameters

    +

    Parameters

    @@ -290,7 +268,7 @@
    -

    Returns

    +

    Returns

    the width of the GPU side texture in pixels

    @@ -301,7 +279,7 @@ cogl_texture_get_height (CoglTexture *texture);

    Queries the height of a cogl texture.

    -

    Parameters

    +

    Parameters

    @@ -316,7 +294,7 @@
    -

    Returns

    +

    Returns

    the height of the GPU side texture in pixels

    @@ -328,7 +306,7 @@

    Queries if a texture is sliced (stored as multiple GPU side tecture objects).

    -

    Parameters

    +

    Parameters

    @@ -343,7 +321,7 @@
    -

    Returns

    +

    Returns

    TRUE if the texture is sliced, FALSE if the texture is stored as a single GPU texture

    @@ -362,7 +340,7 @@ want for the destination data buffer not the rowstride of the source texture
    -

    Parameters

    +

    Parameters

    @@ -401,7 +379,7 @@
    -

    Returns

    +

    Returns

    the size of the texture data in bytes

    @@ -473,7 +451,7 @@ api can return FALSE and throw an exceptional error if there is not enough memory to allocate storage for texture.
    -

    Parameters

    +

    Parameters

    @@ -515,7 +493,7 @@
    -

    Returns

    +

    Returns

    TRUE if the data upload was successful, and FALSE otherwise

    @@ -542,7 +520,7 @@
    The region set can't be larger than the source data
    -

    Parameters

    +

    Parameters

    @@ -619,7 +597,7 @@
    -

    Returns

    +

    Returns

    TRUE if the subregion upload was successful, and FALSE otherwise

    @@ -647,7 +625,7 @@ an image format as long as COGL_TEXTURE_COMPONENTS_RG isn't used as the texture's components.

    -

    Parameters

    +

    Parameters

    @@ -676,7 +654,7 @@ a CoglBitmap or a data pointer default to the same components as the pixel format of the data.

    -

    Parameters

    +

    Parameters

    @@ -719,7 +697,7 @@ state is TRUE .

    -

    Parameters

    +

    Parameters

    @@ -756,7 +734,7 @@

    By default the pre-multipled state is TRUE .

    -

    Parameters

    +

    Parameters

    @@ -771,7 +749,7 @@
    -

    Returns

    +

    Returns

    TRUE if red, green and blue components are internally stored pre-multiplied by the alpha value or FALSE if not.

    @@ -788,10 +766,32 @@
    +

    COGL_TEXTURE_ERROR

    +
    #define COGL_TEXTURE_ERROR (cogl_texture_error_quark ())
+
    +

    CoglError domain for texture errors.

    +

    Since: 1.8

    +

    Stability Level: Unstable

    +
    +
    +

    enum CoglTextureError

    Error codes that can be thrown when allocating textures.

    -

    Members

    +

    Members

    @@ -851,7 +851,7 @@

    Constants representing the underlying hardware texture type of a CoglTexture.

    -

    Members

    +

    Members

    @@ -904,7 +904,7 @@

    enum CoglTextureComponents

    See cogl_texture_set_components().

    -

    Members

    +

    Members

    @@ -957,6 +957,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Top-Level-Context.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Top-Level-Context.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Top-Level-Context.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Top-Level-Context.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -374,7 +374,7 @@ cogl_is_context (void *object);

    Gets whether the given object references an existing context object.

    -

    Parameters

    +

    Parameters

    @@ -389,7 +389,7 @@
    -

    Returns

    +

    Returns

    TRUE if the object references a CoglContext, FALSE otherwise

    @@ -420,7 +420,7 @@ for any state objects that are allocated.

    [constructor]

    -

    Parameters

    +

    Parameters

    @@ -442,7 +442,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglContext.

    [transfer full]

    @@ -474,7 +474,7 @@ cogl_context_new() then this function returns a pointer to the display that was automatically setup internally.

    -

    Parameters

    +

    Parameters

    @@ -489,7 +489,7 @@
    -

    Returns

    +

    Returns

    The CoglDisplay associated with the given context .

    @@ -524,7 +524,7 @@ means applications have some responsibility to explicitly check that certain features are available before depending on them.

    -

    Parameters

    +

    Parameters

    @@ -546,7 +546,7 @@
    -

    Returns

    +

    Returns

    TRUE if the feature is currently supported or FALSE if not.

    @@ -578,7 +578,7 @@ returns TRUE if all the features are available or FALSE otherwise.

    -

    Parameters

    +

    Parameters

    @@ -600,7 +600,7 @@
    -

    Returns

    +

    Returns

    TRUE if all the features are available, FALSE otherwise.

    @@ -629,7 +629,7 @@

    A callback used with cogl_foreach_feature() for enumerating all context level features supported by Cogl.

    -

    Parameters

    +

    Parameters

    @@ -678,7 +678,7 @@ and for each feature callback is called.

    -

    Parameters

    +

    Parameters

    @@ -758,7 +758,7 @@

    Multiplies the current model-view matrix by one that scales the x, y and z axes by the given values.

    -

    Parameters

    +

    Parameters

    @@ -799,7 +799,7 @@

    Multiplies the current model-view matrix by one that translates the model along all three axes according to the given values.

    -

    Parameters

    +

    Parameters

    @@ -847,7 +847,7 @@ degrees about the vertex (0, 0, 1) causes a small counter-clockwise rotation.

    -

    Parameters

    +

    Parameters

    @@ -890,7 +890,7 @@

    Multiplies the current model-view matrix by the given matrix.

    -

    Parameters

    +

    Parameters

    @@ -924,7 +924,7 @@ for a given viewing frustum defined by 4 side clip planes that all cross through the origin and 2 near and far clip planes.

    -

    Parameters

    +

    Parameters

    @@ -990,7 +990,7 @@ since there wont be enough precision to identify the depth of objects near to each other.
    -

    Parameters

    +

    Parameters

    @@ -1050,7 +1050,7 @@ the z clipping planes which would have been consistent with the left, right bottom and top arguments.
    -

    Parameters

    +

    Parameters

    @@ -1108,7 +1108,7 @@

    Stores the current model-view matrix in matrix .

    -

    Parameters

    +

    Parameters

    @@ -1136,7 +1136,7 @@

    Loads matrix as the new model-view matrix.

    -

    Parameters

    +

    Parameters

    @@ -1164,7 +1164,7 @@

    Stores the current projection matrix in matrix .

    -

    Parameters

    +

    Parameters

    @@ -1191,7 +1191,7 @@

    Loads matrix as the new projection matrix.

    -

    Parameters

    +

    Parameters

    @@ -1220,7 +1220,7 @@

    Replaces the current viewport with the given values.

    -

    Parameters

    +

    Parameters

    @@ -1272,7 +1272,7 @@ [3] get the width and height.

    -

    Parameters

    +

    Parameters

    @@ -1304,7 +1304,7 @@ process subsequent primitives, such as rectangles drawn with cogl_rectangle() or vertices drawn using cogl_vertex_buffer_draw().

    -

    Parameters

    +

    Parameters

    @@ -1340,7 +1340,7 @@

    See also cogl_set_source_color4ub() and cogl_set_source_color4f() if you already have the color components.

    -

    Parameters

    +

    Parameters

    @@ -1376,7 +1376,7 @@

    The value for each component is an unsigned byte in the range between 0 and 255.

    -

    Parameters

    +

    Parameters

    @@ -1430,7 +1430,7 @@ between 0 and 1.0. If the values passed in are outside that range, they will be clamped.

    -

    Parameters

    +

    Parameters

    @@ -1488,7 +1488,7 @@ cogl_set_source (material);
    -

    Parameters

    +

    Parameters

    @@ -1523,7 +1523,7 @@ reference to an internally managed materials and the result of modifying such materials is undefined.
    -

    Returns

    +

    Returns

    The current source material.

    Since: 1.6

    @@ -1544,7 +1544,7 @@ material at the top of this stack defines the GPU state used to process later primitives as defined by cogl_set_source().

    -

    Parameters

    +

    Parameters

    @@ -1591,7 +1591,7 @@ that includes the color buffer then the specified color is used.

    -

    Parameters

    +

    Parameters

    @@ -1639,7 +1639,7 @@ specify a format that doesn't use an alpha channel or use one of the formats ending in PRE.

    -

    Parameters

    +

    Parameters

    @@ -1725,7 +1725,7 @@ by Cogl. Applications that depend on any of these features should explicitly check for them using cogl_has_feature() or cogl_has_features().

    -

    Members

    +

    Members

    @@ -1945,7 +1945,7 @@

    enum CoglReadPixelsFlags

    Flags for cogl_framebuffer_read_pixels_into_bitmap()

    -

    Members

    +

    Members

    @@ -1966,6 +1966,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Versioning-utility-macros.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Versioning-utility-macros.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Versioning-utility-macros.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Versioning-utility-macros.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -197,7 +197,7 @@

    -

    Parameters

    +

    Parameters

    @@ -257,7 +257,7 @@

    -

    Parameters

    +

    Parameters

    @@ -284,7 +284,7 @@
    -

    Returns

    +

    Returns

    TRUE if the Cogl version being compiled against is greater than or equal to the given three part version number.

    @@ -296,7 +296,7 @@ 
    #define             COGL_VERSION_GET_MAJOR(version)

    Extracts the major part of an encoded version number.

    -

    Parameters

    +

    Parameters

    @@ -318,7 +318,7 @@ 
    #define             COGL_VERSION_GET_MINOR(version)

    Extracts the minor part of an encoded version number.

    -

    Parameters

    +

    Parameters

    @@ -340,7 +340,7 @@ 
    #define             COGL_VERSION_GET_MICRO(version)

    Extracts the micro part of an encoded version number.

    -

    Parameters

    +

    Parameters

    @@ -403,6 +403,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Vertex-Attributes.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Vertex-Attributes.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Vertex-Attributes.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Vertex-Attributes.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -209,7 +209,7 @@ a large number of vertices.

    [constructor]

    -

    Parameters

    +

    Parameters

    @@ -258,7 +258,7 @@
    -

    Returns

    +

    Returns

    A newly allocated CoglAttribute describing the layout for a list of attribute values stored in array @@ -288,7 +288,7 @@ cogl_is_attribute (void *object);

    Gets whether the given object references a CoglAttribute.

    -

    Parameters

    +

    Parameters

    @@ -303,7 +303,7 @@
    -

    Returns

    +

    Returns

    TRUE if the object references a CoglAttribute, FALSE otherwise

    @@ -324,7 +324,7 @@ cogl_normal_in it will default to TRUE and for all other names it will default to FALSE.

    -

    Parameters

    +

    Parameters

    @@ -367,7 +367,7 @@ 
    CoglBool
 cogl_attribute_get_normalized (CoglAttribute *attribute);
    -

    Parameters

    +

    Parameters

    @@ -382,7 +382,7 @@
    -

    Returns

    +

    Returns

    the value of the normalized property set with cogl_attribute_set_normalized().

    @@ -408,7 +408,7 @@ 
    CoglAttributeBuffer *
 cogl_attribute_get_buffer (CoglAttribute *attribute);
    -

    Parameters

    +

    Parameters

    @@ -423,7 +423,7 @@
    -

    Returns

    +

    Returns

    the CoglAttributeBuffer that was set with cogl_attribute_set_buffer() or cogl_attribute_new().

    [transfer none]

    @@ -452,7 +452,7 @@ CoglAttributeBuffer *attribute_buffer);

    Sets a new CoglAttributeBuffer for the attribute.

    -

    Parameters

    +

    Parameters

    @@ -499,6 +499,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-X11-Texture-From-Pixmap.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-X11-Texture-From-Pixmap.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-X11-Texture-From-Pixmap.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-X11-Texture-From-Pixmap.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -117,7 +117,7 @@

    Checks whether object points to a CoglTexturePixmapX11 instance.

    -

    Parameters

    +

    Parameters

    @@ -132,7 +132,7 @@
    -

    Returns

    +

    Returns

    TRUE if the object is a CoglTexturePixmapX11, and FALSE otherwise

    @@ -167,7 +167,7 @@ damage events on the pixmap and automatically update the texture when it changes.

    -

    Parameters

    +

    Parameters

    @@ -200,7 +200,7 @@
    -

    Returns

    +

    Returns

    a new CoglTexturePixmapX11 instance

    Since: 1.10

    @@ -233,7 +233,7 @@ the contents of the pixmap that was given to cogl_texture_pixmap_x11_new().

    -

    Parameters

    +

    Parameters

    @@ -298,7 +298,7 @@ implemented as zero-copy operation so it implies the updates are working efficiently.

    -

    Parameters

    +

    Parameters

    @@ -313,7 +313,7 @@
    -

    Returns

    +

    Returns

    TRUE if the texture is using an efficient extension and FALSE otherwise

    @@ -350,7 +350,7 @@

    Note that Cogl will subtract from the damage region as it processes damage events.

    -

    Parameters

    +

    Parameters

    @@ -405,7 +405,7 @@

    enum CoglTexturePixmapX11ReportLevel

    -

    Members

    +

    Members

    @@ -440,6 +440,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-Blend-Strings.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-Blend-Strings.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-Blend-Strings.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-Blend-Strings.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -134,6 +134,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-buffer-apis.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-buffer-apis.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-buffer-apis.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-buffer-apis.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -22,6 +22,6 @@

    Allocating GPU Memory

    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-buffer-layout-apis.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-buffer-layout-apis.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-buffer-layout-apis.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-buffer-layout-apis.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -22,6 +22,6 @@

    Describing the layout of GPU Memory

    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-context-apis.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-context-apis.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-context-apis.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-context-apis.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -22,6 +22,6 @@

    Setting Up A Drawing Context

    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-framebuffer-apis.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-framebuffer-apis.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-framebuffer-apis.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-framebuffer-apis.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -22,6 +22,6 @@

    Framebuffers

    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-general-apis.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-general-apis.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-general-apis.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-general-apis.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -22,6 +22,6 @@

    General API concepts

    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/coglglossary.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/coglglossary.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/coglglossary.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/coglglossary.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -85,6 +85,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-integration.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-integration.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-integration.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-integration.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -22,6 +22,6 @@

    Binding and Integrating

    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-meta-textures.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-meta-textures.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-meta-textures.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-meta-textures.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -22,6 +22,6 @@

    Meta Textures

    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-pipeline-apis.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-pipeline-apis.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-pipeline-apis.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-pipeline-apis.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -22,6 +22,6 @@

    Setting Up A GPU Pipeline

    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-primitive-apis.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-primitive-apis.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-primitive-apis.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-primitive-apis.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -22,6 +22,6 @@

    Geometry

    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-primitive-textures.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-primitive-textures.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-primitive-textures.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-primitive-textures.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -22,6 +22,6 @@

    Primitive Textures

    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-textures.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-textures.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-textures.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-textures.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -22,6 +22,6 @@

    Textures

    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-utilities.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-utilities.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/cogl-utilities.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/cogl-utilities.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -22,6 +22,6 @@

    Utilities

    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/index.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/index.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/index.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/index.html 2016-08-26 17:38:09.000000000 +0000 @@ -6,7 +6,7 @@ - + @@ -249,6 +249,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/ix01.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/ix01.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/ix01.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/ix01.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -2506,6 +2506,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/ix02.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/ix02.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/ix02.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/ix02.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -182,6 +182,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/ix03.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/ix03.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/ix03.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/ix03.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -36,6 +36,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/ix04.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/ix04.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/ix04.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/ix04.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -223,6 +223,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/ix05.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/ix05.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/ix05.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/ix05.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -97,6 +97,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/ix06.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/ix06.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/ix06.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/ix06.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -241,6 +241,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/license.html cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/license.html --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/html/license.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/html/license.html 2016-08-26 17:38:09.000000000 +0000 @@ -7,7 +7,7 @@ - + @@ -52,6 +52,6 @@

    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-2.0-experimental/Makefile.in cogl-1.22.2/doc/reference/cogl-2.0-experimental/Makefile.in --- cogl-1.22.0/doc/reference/cogl-2.0-experimental/Makefile.in 2015-09-16 14:00:52.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-2.0-experimental/Makefile.in 2016-08-26 17:33:59.000000000 +0000 @@ -291,6 +291,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -724,11 +725,11 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@BUILD_GTK_DOC_FALSE@install-data-local: +@BUILD_GTK_DOC_FALSE@maintainer-clean-local: @BUILD_GTK_DOC_FALSE@uninstall-local: -@BUILD_GTK_DOC_FALSE@distclean-local: @BUILD_GTK_DOC_FALSE@clean-local: -@BUILD_GTK_DOC_FALSE@maintainer-clean-local: +@BUILD_GTK_DOC_FALSE@distclean-local: +@BUILD_GTK_DOC_FALSE@install-data-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am diff -Nru cogl-1.22.0/doc/reference/cogl-gst/cogl-gst-docs.xml cogl-1.22.2/doc/reference/cogl-gst/cogl-gst-docs.xml --- cogl-1.22.0/doc/reference/cogl-gst/cogl-gst-docs.xml 2015-09-16 14:00:56.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-gst/cogl-gst-docs.xml 2016-08-26 17:35:02.000000000 +0000 @@ -1,7 +1,7 @@ + ]> diff -Nru cogl-1.22.0/doc/reference/cogl-gst/html/ch01.html cogl-1.22.2/doc/reference/cogl-gst/html/ch01.html --- cogl-1.22.0/doc/reference/cogl-gst/html/ch01.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-gst/html/ch01.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -39,6 +39,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-gst/html/coglglossary.html cogl-1.22.2/doc/reference/cogl-gst/html/coglglossary.html --- cogl-1.22.0/doc/reference/cogl-gst/html/coglglossary.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-gst/html/coglglossary.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -55,6 +55,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-gst/html/cogl-gst-general-apis.html cogl-1.22.2/doc/reference/cogl-gst/html/cogl-gst-general-apis.html --- cogl-1.22.0/doc/reference/cogl-gst/html/cogl-gst-general-apis.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-gst/html/cogl-gst-general-apis.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -22,6 +22,6 @@

    General APIs

    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-gst/html/CoglGstVideoSink.html cogl-1.22.2/doc/reference/cogl-gst/html/CoglGstVideoSink.html --- cogl-1.22.0/doc/reference/cogl-gst/html/CoglGstVideoSink.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-gst/html/CoglGstVideoSink.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -258,7 +258,7 @@

    Creates a new CoglGstVideoSink which will create resources for use with the given context.

    -

    Parameters

    +

    Parameters

    @@ -273,7 +273,7 @@
    -

    Returns

    +

    Returns

    a new CoglGstVideoSink.

    [transfer full]

    @@ -290,7 +290,7 @@ sink was constructed via gst_element_factory_make() instead of cogl_gst_video_sink_new().

    -

    Parameters

    +

    Parameters

    @@ -329,7 +329,7 @@

    Note: it is considered an error to call this function before the “pipeline-ready” signal is emitted.

    -

    Parameters

    +

    Parameters

    @@ -344,7 +344,7 @@
    -

    Returns

    +

    Returns

    the pipeline for rendering the current frame.

    [transfer none]

    @@ -365,7 +365,7 @@ would then make a copy of its template pipeline and call this to set the textures.

    -

    Parameters

    +

    Parameters

    @@ -403,7 +403,7 @@

    Note: it is considered an error to call this function before the “pipeline-ready” signal is emitted.

    -

    Parameters

    +

    Parameters

    @@ -439,7 +439,7 @@ be used by the application to add additional layers, for example to blend in another color in the fragment processing.

    -

    Parameters

    +

    Parameters

    @@ -454,7 +454,7 @@
    -

    Returns

    +

    Returns

    the index of the next available layer after the sink's internal layers.

    @@ -478,7 +478,7 @@ is three then the function will be cogl_gst_sample_video3.

    -

    Parameters

    +

    Parameters

    @@ -518,7 +518,7 @@ default snippet being added. In that case the application's snippet can call cogl_gst_sample_video0 to sample the texture itself.

    -

    Parameters

    +

    Parameters

    @@ -555,7 +555,7 @@ is passed between components that didn't have an opportunity to connect a signal handler this can be useful.

    -

    Parameters

    +

    Parameters

    @@ -570,7 +570,7 @@
    -

    Returns

    +

    Returns

    TRUE if the sink is ready, else FALSE

    Since: 1.16

    @@ -586,7 +586,7 @@

    This aspect ratio is calculated based on the underlying size of the video buffers and the current pixel-aspect-ratio.

    -

    Parameters

    +

    Parameters

    @@ -601,7 +601,7 @@
    -

    Returns

    +

    Returns

    a width-for-height aspect ratio

    Since: 1.16

    @@ -631,7 +631,7 @@ that will maintain the video's aspect ratio.

    -

    Parameters

    +

    Parameters

    @@ -654,7 +654,7 @@
    -

    Returns

    +

    Returns

    An output width for the given output height .

    @@ -685,7 +685,7 @@ that will maintain the video's aspect ratio.

    -

    Parameters

    +

    Parameters

    @@ -708,7 +708,7 @@
    -

    Returns

    +

    Returns

    An output height for the given output width .

    @@ -744,7 +744,7 @@ using this api to position a video inside a fixed screen space and filling the remaining space with black borders.

    -

    Parameters

    +

    Parameters

    @@ -805,7 +805,7 @@ };
    -

    Members

    +

    Members

    @@ -854,7 +854,7 @@ application is using a custom pipeline it can alternatively call cogl_gst_video_sink_attach_frame() to attach the textures.

    -

    Parameters

    +

    Parameters

    @@ -896,7 +896,7 @@ will only be emitted after the pipeline is ready so the application could also create its pipeline in the handler for that.

    -

    Parameters

    +

    Parameters

    @@ -923,6 +923,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-gst/html/index.html cogl-1.22.2/doc/reference/cogl-gst/html/index.html --- cogl-1.22.0/doc/reference/cogl-gst/html/index.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-gst/html/index.html 2016-08-26 17:38:09.000000000 +0000 @@ -6,7 +6,7 @@ - + @@ -14,7 +14,7 @@
    -

    for Cogl 1.22.0

    +

    for Cogl 1.22.2

    Copyright © 2013 Intel Corporation

    @@ -58,6 +58,6 @@

    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25
    \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-gst/html/ix01.html cogl-1.22.2/doc/reference/cogl-gst/html/ix01.html --- cogl-1.22.0/doc/reference/cogl-gst/html/ix01.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-gst/html/ix01.html 2016-08-26 17:38:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -100,6 +100,6 @@
    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25
    \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-gst/html/license.html cogl-1.22.2/doc/reference/cogl-gst/html/license.html --- cogl-1.22.0/doc/reference/cogl-gst/html/license.html 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-gst/html/license.html 2016-08-26 17:38:09.000000000 +0000 @@ -7,7 +7,7 @@ - + @@ -52,6 +52,6 @@

    -
    Generated by GTK-Doc V1.24.1
    +
    Generated by GTK-Doc V1.25
    \ No newline at end of file diff -Nru cogl-1.22.0/doc/reference/cogl-gst/Makefile.in cogl-1.22.2/doc/reference/cogl-gst/Makefile.in --- cogl-1.22.0/doc/reference/cogl-gst/Makefile.in 2015-09-16 14:00:52.000000000 +0000 +++ cogl-1.22.2/doc/reference/cogl-gst/Makefile.in 2016-08-26 17:33:59.000000000 +0000 @@ -290,6 +290,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -697,11 +698,11 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@BUILD_GTK_DOC_FALSE@uninstall-local: @BUILD_GTK_DOC_FALSE@install-data-local: -@BUILD_GTK_DOC_FALSE@maintainer-clean-local: -@BUILD_GTK_DOC_FALSE@distclean-local: @BUILD_GTK_DOC_FALSE@clean-local: +@BUILD_GTK_DOC_FALSE@distclean-local: +@BUILD_GTK_DOC_FALSE@uninstall-local: +@BUILD_GTK_DOC_FALSE@maintainer-clean-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am diff -Nru cogl-1.22.0/doc/reference/Makefile.in cogl-1.22.2/doc/reference/Makefile.in --- cogl-1.22.0/doc/reference/Makefile.in 2015-09-16 14:00:52.000000000 +0000 +++ cogl-1.22.2/doc/reference/Makefile.in 2016-08-26 17:33:59.000000000 +0000 @@ -344,6 +344,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru cogl-1.22.0/examples/Makefile.in cogl-1.22.2/examples/Makefile.in --- cogl-1.22.0/examples/Makefile.in 2015-09-16 14:00:52.000000000 +0000 +++ cogl-1.22.2/examples/Makefile.in 2016-08-26 17:33:59.000000000 +0000 @@ -520,6 +520,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru cogl-1.22.0/Makefile.am cogl-1.22.2/Makefile.am --- cogl-1.22.0/Makefile.am 2015-08-21 10:45:44.000000000 +0000 +++ cogl-1.22.2/Makefile.am 2016-08-26 17:33:29.000000000 +0000 @@ -35,7 +35,6 @@ DISTCHECK_CONFIGURE_FLAGS = \ --enable-gtk-doc \ --enable-maintainer-flags \ - --enable-profile \ --enable-gles2 \ --enable-gl \ --enable-xlib-egl-platform \ diff -Nru cogl-1.22.0/Makefile.in cogl-1.22.2/Makefile.in --- cogl-1.22.0/Makefile.in 2015-09-16 14:00:51.000000000 +0000 +++ cogl-1.22.2/Makefile.in 2016-08-26 17:33:58.000000000 +0000 @@ -380,6 +380,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -503,7 +504,6 @@ DISTCHECK_CONFIGURE_FLAGS = \ --enable-gtk-doc \ --enable-maintainer-flags \ - --enable-profile \ --enable-gles2 \ --enable-gl \ --enable-xlib-egl-platform \ diff -Nru cogl-1.22.0/NEWS cogl-1.22.2/NEWS --- cogl-1.22.0/NEWS 2015-09-16 13:59:48.000000000 +0000 +++ cogl-1.22.2/NEWS 2016-08-26 17:33:29.000000000 +0000 @@ -1,3 +1,24 @@ +Cogl 1.22.2 2016-08-25 + + • List of changes since Cogl 1.22.0 + + » Skip journal dumping if not supported [#728355] + » Support glMapBufferRange from ES3 [#728355] + » Improvements in the KMS winsys [#756926, #758073] + » Require gettext 0.19 to avoid hacks [#760285] + » Respect the Wayland spec for EGL surface creation [#765351] + +Many thanks to: + + Cédric Valmary + Emmanuele Bassi + Ray Strode + Daniel Stone + Piotr Drąg + Javier Jardón + Murray Cumming + Sjoerd Simons + Cogl 1.22.0 2015-09-16 • List of changes since Cogl 1.21.2 Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/an.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/an.gmo differ diff -Nru cogl-1.22.0/po/an.po cogl-1.22.2/po/an.po --- cogl-1.22.0/po/an.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/an.po 2016-02-23 12:06:45.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-02-16 20:23+0000\n" "PO-Revision-Date: 2013-02-18 21:08+0100\n" "Last-Translator: Daniel Martinez \n" "Language-Team: Aragonese \n" @@ -18,226 +18,226 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Valors de depuración suportaus:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Valors especials de depuración:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Activa todas as opcions de depuración sin comportamiento" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Variables d'entorno adicionals:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "" "Lista d'as extensions de GL separadas por comas que se miran de desactivar" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "Omitir a versión de GL que Cogl asumirá que suporta o driver" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:237 msgid "Cogl debugging flags to set" msgstr "Opcions de depuracion de Colg que activar" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:239 msgid "Cogl debugging flags to unset" msgstr "Opcions de depuracion de Colg que desactivar" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:288 msgid "Cogl Options" msgstr "Opcions de Colg" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:289 msgid "Show Cogl options" msgstr "Amostrar as opcions de Colg" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Rastreo de Cogl" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "Referencias de CoglObject" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Depurar problemas de conteo de referencias ta CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Rastriar o troceau de texturas" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "depurar a creyación de troceau de texturas" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Rastriar texturas atlas" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Chestión d'a depuración de texturas atlas" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Rastriar cadenas de mezclau" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Analís de depuración de CoglBlendString" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Rastriar diario" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Veyer toda a cheometría que pasa a traviés d'o diario" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Rastriar procesau por lotes" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Amostrar cómo se procesa por lotes a cheometría en o diario" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Rastriar matrices" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Rastriar toda a manipulación de matrices" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Rastriar dibuixau variau" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Rastriar qualques operacions de dibuixau variadas" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Rastriar dibuixau Pango" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Rastriar o dibuixau Pango de Cogl" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Rastriar o backend de CoglTexturePixmap" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Rastriar o backend d'o mapa de pixels d'a textura de Cogl" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Visualizar" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Esbozar rectanglos" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Adhibir trazos de linias ta toda a cheometría rectangular" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Amostrar trazaus de linias (wireframes)" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Adhibir trazos de linias ta toda a cheometría" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Causa radiz" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Desactivar o procesau por lotes en o diario" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Desactivar o procesau por lotes d'a cheometría en o diario de Cogl." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Desactivar os búferes vertex de GL" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Desactivar l'uso d'obchectos de búfer vertex d'OpenGL" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Desactivar os búferes de pixel GL" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Desactivar l'uso d'obchectos de búfer de pixels d'OpenGL" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Desactivar a transformación de rectas por software" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Usar a GPU ta transformar cheometría rectangular" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Especialista de Cogl" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Vulcar atlas d'imachens" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Vulcar cambeos en a textura d'atlas a un fichero d'imachen" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Desactivar os atlas de texturas" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Desactivar l'uso d'atlas de texturas" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "Desactivar a compartición d'atlas de texturas entre texto y imachens" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -245,51 +245,51 @@ "Quan isto ye establiu, a caché de glyph usará siempre una textura separada " "ta la suya atlas. D'unatro modo, intentará compartir l'atlas con as imachens." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Desactivar texturizau" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Desactivar o texturizau de qualsiquier primitiva" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Desactivar arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Desactivar l'uso de programas de fragmentos ARB" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Desactivar a función fixa" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Desactivar l'uso d'o backend d'a canyería d'a función fixa" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Desactivar GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Desactivar l'uso de GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Desactivar la mezcla" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Desactivar l'uso de la mezcla" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Desactivar as texturas que no sían potencias de dos" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -297,70 +297,70 @@ "Fa que Cogl creya que o driver de GL no suporta texturas NPOT, por o que " "creyará texturas troceadas u texturas con residuos" -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Desactivar rectorte software" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" "Desactiva os intentos de Cogl de retallar qualques rectanglos en software." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Amostrar fuent" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Amostrar o codigo fuent ARBfp/GLSL chenerau" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Rastriar qualques OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Rastrea qualques gritadas OpenGL seleccionadas" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Rastriar suporte ta difuera d'a pantalla" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Depurar suporte ta difuera d'a pantalla" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Desactivar as cachés d'os programas" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Desactivar as cachés alternativas ta programas arbfp y glsl" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Desactivar optimización de lectura de pixel" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Desactivar a optimización de lectura de 1px ta scenas simplas de rectanglos " "opacos" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Rastriar retalles" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Información d'os rechistros sobre cómo implementa Cogl los retalles" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Rastriar problemas de rendimiento" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Intenta resaltar l'uso no optimo de Cogl" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/ar.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/ar.gmo differ diff -Nru cogl-1.22.0/po/ar.po cogl-1.22.2/po/ar.po --- cogl-1.22.0/po/ar.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/ar.po 2016-02-23 12:06:45.000000000 +0000 @@ -7,7 +7,7 @@ "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"POT-Creation-Date: 2012-03-05 23:14+0000\n" "PO-Revision-Date: 2011-09-03 00:31+0300\n" "Last-Translator: Abdalrahim G. Fakhouri \n" "Language-Team: Arabic \n" @@ -20,341 +20,320 @@ "X-Generator: Virtaal 0.7.0\n" "X-Project-Style: gnome\n" -#: cogl/cogl-debug.c:181 +#: cogl/cogl-debug.c:172 msgid "Supported debug values:" msgstr "" -#: cogl/cogl-debug.c:186 +#: cogl/cogl-debug.c:177 msgid "Special debug values:" msgstr "" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: cogl/cogl-debug.c:179 cogl/cogl-debug.c:181 msgid "Enables all non-behavioural debug options" msgstr "" -#: cogl/cogl-debug.c:197 -msgid "Additional environment variables:" -msgstr "" - -#: cogl/cogl-debug.c:198 -msgid "Comma-separated list of GL extensions to pretend are disabled" -msgstr "" - -#: cogl/cogl-debug.c:200 -msgid "Override the GL version that Cogl will assume the driver supports" -msgstr "" - -#: cogl/cogl-debug.c:244 +#: cogl/cogl-debug.c:225 msgid "Cogl debugging flags to set" msgstr "شارات تنقيح جتك+ التي ستُضبط" -#: cogl/cogl-debug.c:246 +#: cogl/cogl-debug.c:227 msgid "Cogl debugging flags to unset" msgstr "شارات تنقيح جتك+ التي ستُصفّر" -#: cogl/cogl-debug.c:295 +#: cogl/cogl-debug.c:276 msgid "Cogl Options" msgstr "خيارات Cogl" -#: cogl/cogl-debug.c:296 +#: cogl/cogl-debug.c:277 msgid "Show Cogl options" msgstr "أظهر خيارات Cogl" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: cogl/cogl-debug-options.h:25 cogl/cogl-debug-options.h:30 +#: cogl/cogl-debug-options.h:35 cogl/cogl-debug-options.h:40 +#: cogl/cogl-debug-options.h:45 cogl/cogl-debug-options.h:50 +#: cogl/cogl-debug-options.h:55 cogl/cogl-debug-options.h:61 +#: cogl/cogl-debug-options.h:66 cogl/cogl-debug-options.h:71 +#: cogl/cogl-debug-options.h:158 cogl/cogl-debug-options.h:163 +#: cogl/cogl-debug-options.h:168 cogl/cogl-debug-options.h:184 msgid "Cogl Tracing" msgstr "" -#: cogl/cogl-debug-options.h:34 +#: cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "" -#: cogl/cogl-debug-options.h:35 +#: cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "" -#: cogl/cogl-debug-options.h:39 +#: cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "" -#: cogl/cogl-debug-options.h:40 +#: cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "" -#: cogl/cogl-debug-options.h:44 +#: cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "" -#: cogl/cogl-debug-options.h:45 +#: cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "" -#: cogl/cogl-debug-options.h:49 +#: cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "" -#: cogl/cogl-debug-options.h:50 +#: cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "" -#: cogl/cogl-debug-options.h:54 +#: cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "" -#: cogl/cogl-debug-options.h:55 +#: cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "" -#: cogl/cogl-debug-options.h:59 +#: cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "" -#: cogl/cogl-debug-options.h:60 +#: cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "" -#: cogl/cogl-debug-options.h:64 +#: cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "" -#: cogl/cogl-debug-options.h:65 +#: cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "" -#: cogl/cogl-debug-options.h:70 +#: cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "" -#: cogl/cogl-debug-options.h:71 +#: cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "" -#: cogl/cogl-debug-options.h:75 +#: cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "" -#: cogl/cogl-debug-options.h:76 +#: cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "" -#: cogl/cogl-debug-options.h:80 +#: cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:81 +#: cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: cogl/cogl-debug-options.h:76 cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "" -#: cogl/cogl-debug-options.h:85 +#: cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "" -#: cogl/cogl-debug-options.h:86 +#: cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:90 +#: cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "" -#: cogl/cogl-debug-options.h:91 +#: cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: cogl/cogl-debug-options.h:86 cogl/cogl-debug-options.h:91 +#: cogl/cogl-debug-options.h:96 cogl/cogl-debug-options.h:101 +#: cogl/cogl-debug-options.h:111 cogl/cogl-debug-options.h:116 +#: cogl/cogl-debug-options.h:122 cogl/cogl-debug-options.h:127 +#: cogl/cogl-debug-options.h:132 cogl/cogl-debug-options.h:137 +#: cogl/cogl-debug-options.h:142 cogl/cogl-debug-options.h:147 +#: cogl/cogl-debug-options.h:153 cogl/cogl-debug-options.h:173 +#: cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "" -#: cogl/cogl-debug-options.h:95 +#: cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "" -#: cogl/cogl-debug-options.h:96 +#: cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "" -#: cogl/cogl-debug-options.h:100 +#: cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "" -#: cogl/cogl-debug-options.h:101 +#: cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:105 +#: cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "" -#: cogl/cogl-debug-options.h:106 +#: cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:110 +#: cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "" -#: cogl/cogl-debug-options.h:111 +#: cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:113 +#: cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "" -#: cogl/cogl-debug-options.h:115 +#: cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "" -#: cogl/cogl-debug-options.h:116 +#: cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "" -#: cogl/cogl-debug-options.h:120 +#: cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:121 +#: cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:125 +#: cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "" -#: cogl/cogl-debug-options.h:126 +#: cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." msgstr "" -#: cogl/cogl-debug-options.h:131 +#: cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "" -#: cogl/cogl-debug-options.h:132 +#: cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "" -#: cogl/cogl-debug-options.h:136 +#: cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "" -#: cogl/cogl-debug-options.h:137 +#: cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "" -#: cogl/cogl-debug-options.h:141 +#: cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "" -#: cogl/cogl-debug-options.h:142 +#: cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "" -#: cogl/cogl-debug-options.h:146 +#: cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "" -#: cogl/cogl-debug-options.h:147 +#: cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "" -#: cogl/cogl-debug-options.h:151 +#: cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "" -#: cogl/cogl-debug-options.h:152 +#: cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "" -#: cogl/cogl-debug-options.h:156 +#: cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "" -#: cogl/cogl-debug-options.h:157 +#: cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." msgstr "" -#: cogl/cogl-debug-options.h:162 +#: cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "" -#: cogl/cogl-debug-options.h:163 +#: cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" -#: cogl/cogl-debug-options.h:167 +#: cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "" -#: cogl/cogl-debug-options.h:168 +#: cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "" -#: cogl/cogl-debug-options.h:172 +#: cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "" -#: cogl/cogl-debug-options.h:173 +#: cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "" -#: cogl/cogl-debug-options.h:177 +#: cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:178 +#: cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:182 +#: cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "" -#: cogl/cogl-debug-options.h:183 +#: cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "" -#: cogl/cogl-debug-options.h:187 +#: cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "" -#: cogl/cogl-debug-options.h:188 +#: cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" -#: cogl/cogl-debug-options.h:193 +#: cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "" -#: cogl/cogl-debug-options.h:194 +#: cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "" - -#: cogl/cogl-debug-options.h:198 -msgid "Trace performance concerns" -msgstr "" - -#: cogl/cogl-debug-options.h:199 -msgid "Tries to highlight sub-optimal Cogl usage." -msgstr "" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/as.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/as.gmo differ diff -Nru cogl-1.22.0/po/as.po cogl-1.22.2/po/as.po --- cogl-1.22.0/po/as.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/as.po 2016-08-26 16:18:04.000000000 +0000 @@ -7,238 +7,222 @@ msgid "" msgstr "" "Project-Id-Version: cogl master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." +"cgi?product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-08-01 10:44+0000\n" "PO-Revision-Date: 2012-08-08 13:28+0530\n" "Last-Translator: Nilamdyuti Goswami \n" "Language-Team: as_IN \n" -"Language: \n" +"Language: as\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "সমৰ্থিত ডিবাগ মানসমূহ:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "বিশেষ ডিবাগ মানসমূহ:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "সকলো অ-ব্যৱহাৰী ডিভাগ বিকল্পসমূহ সামৰ্থবান কৰে" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "অতিৰিক্ত পৰিৱেশ চলকসমূহ:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "ভাঁও ধৰিবলে GL সম্প্ৰসাৰনসমূহৰ কমা-পৃথকিত তালিকা অসামৰ্থবান কৰা আছে" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "GL সংস্কৰণ যাক Cogl এ ড্ৰাইভাৰে সমৰ্থন কৰিব বুলি ভাবি লব তাক অভাৰৰাইড কৰক" -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "সংহতি কৰিবলে Cogl ডিবাগিং ফ্লেগসমূহ" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "অসংহতি কৰিবলে Cogl ডিবাগিং ফ্লেগসমূহ" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "Cogl বিকল্পসমূহ" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "Cogl বিকল্পসমূহ দেখুৱাওক" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Cogl অনুকৰণ" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "CoglObject প্ৰসংগসমূহ" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "CoglObjects ৰ বাবে ref গণনা বিষয়সমূহ ডিবাগ কৰক" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "গাঁথনি স্লাইচিং অনুকৰণ কৰক" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "বাং স্লাইচৰ সৃষ্টি ডিবাগ কৰক" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "ভূচিত্ৰাৱলীৰ গাঁথনি অনুকৰণ কৰক" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "গাঁথনি ভূচিত্ৰাৱলী ব্যৱস্থাপনা ডিবাগ কৰক" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "মিশ্ৰণ স্ট্ৰিংসমূহ অনুকৰণ কৰক" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "CoglBlendString বিশ্লেষণ ডিবাগ কৰক" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "আলোচনী অনুকৰণ কৰক" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "আলোচনীৰ সকলো জ্যামিতি দৰ্শন কৰক" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "চাম অনুকৰণ কৰক" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "আলোচনীত কিধৰণে জ্যামিতি চাম কৰা হৈছে দেখুৱাওক" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "আধাৰসমূহ অনুকৰণ কৰক" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "সকলো আধাৰ পৰিবৰ্তন অনুকৰণ কৰক" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "বিভিন্ন অঙ্কণ অনুকৰণ কৰক" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "কিছুমান বিভিন্ন অঙ্কণ কাৰ্যসমূহ অনুকৰণ কৰক" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Pango ৰেণ্ডাৰাৰ অনুকৰণ কৰক" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Cogl Pango ৰেণ্ডাৰাৰ অনুকৰণ কৰক" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "CoglTexturePixmap বেকএণ্ড অনুকৰণ কৰক" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Cogl গাঁথনি pixmap বেকএণ্ড অনুকৰণ কৰক" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "কল্পনা কৰক" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "সাৰাংশ আয়তসমূহ" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "সকলো আয়তীয় জ্যামিতিৰ বাবে তাঁৰ সাৰাংশসমূহ যোগ কৰক" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "তাঁৰফ্ৰেইমসমূহ দেখুৱাওক" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "সকলো জ্যামিতিৰ বাবে তাঁৰ সাৰাংশসমূহ যোগ কৰক" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "মূল কাৰণ" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "আলোচনী চাম অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Cogl আলোচনীত জ্যামিতিৰ চাম অসামৰ্থবান কৰক।" -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "GL শীৰ্ষবিন্দু বাফাৰসমূহ অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "OpenGL শীৰ্ষবিন্দু বাফাৰ অবজেক্টসমূহৰ ব্যৱহাৰ অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "GL পিক্সেল বাফাৰসমূহৰ ব্যৱহাৰ অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "OpenGL পিক্সেল বাফাৰসমূহৰ ব্যৱহাৰ অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "চফ্টৱেৰ ৰেক্ট পৰিবৰ্তন অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "আয়তীয় জ্যামিতি পৰিবৰ্তন কৰিবলে GPU ব্যৱহাৰ কৰক" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Cogl বিশেষজ্ঞ" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "ভূচিত্ৰাৱলী ছবিসমূহ ডাম্প কৰক" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "এটা ছবি ফাইললে গাঁথনি ভূচিত্ৰাৱলী পৰিবৰ্তনসমূহ ডাম্প কৰক" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "গাঁথনি ভূচিত্ৰাৱলী অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "গাঁথনি ভূচিত্ৰাৱলীৰ ব্যৱহাৰ অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "লিখনী আৰু ছবিসমূহৰ মাজৰ গাঁথনি ভূচিত্ৰাৱলী অংশীদাৰী অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -246,51 +230,51 @@ "যেতিয়া ইয়াক সংহতি কৰা হয় গ্লিফ ক্যাশে ইয়াৰ ভূচিত্ৰাৱলীৰ বাবে সদায় এটা পৃথক গাঁথনি " "ব্যৱহাৰ কৰিব। নহলে ই ভুচিত্ৰাৱলীক ছবিসমূহৰ সৈতে অংশীদাৰী কৰাৰ চেষ্টা কৰিব।" -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "গাঁথনি অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "কোনো আদিমৰ গাঁথনিকৰণ অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "arbfp অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "ARB অংশ প্ৰগ্ৰাসমূহৰ ব্যৱহাৰ অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "অসামৰ্থবান ঠিক কৰা হল" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "ঠিক কৰা ফলন পাইপলাইন বেকএণ্ডৰ ব্যৱহাৰ অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "GLSL অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "GLSL ৰ ব্যৱহাৰ অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "মিশ্ৰণ অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "মিশ্ৰণৰ ব্যৱহাৰ অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "non-power-of-two গাঁথনি অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -298,67 +282,78 @@ "Cogl এ ভাৱিবলে লয় যে GL ড্ৰাইভাৰে NPOT গাঁথনি সমৰ্থন নকৰে যাতে ই স্লাইচ্ড গাঁথনি " "অথবা আবৰ্জনাৰ সৈতে গাঁথনিসমূহ সৃষ্টি কৰে।" -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "চফ্টৱেৰ ক্লিপিং অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "চফ্টৱেৰত কিছুমান আয়ত ক্লিপ কৰাৰ Cogl ৰ চেষ্টা অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "উৎস দেখুৱাওক" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "সৃজন কৰা ARBfp/GLSL উৎস ক'ড দেখুৱাওক" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "কিছুমান OpenGL অনুকৰণ কৰক" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "কিছুমান নিৰ্বাচিত OpenGL কলসমূহ অনুকৰণ কৰে" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "অফস্ক্ৰিণ সমৰ্থন অনুকৰণ কৰক" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "অপস্ক্ৰিন সমৰ্থন ডিবাগ কৰক" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "প্ৰগ্ৰাম ক্যাশসমূহ অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "arbfp আৰু glsl প্ৰগ্ৰামসমূহৰ বাবে ফলবেক ক্যাশসমূহ অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "পঢ়া পিক্সেল অনুকূলীকৰণ অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:188 -msgid "" -"Disable optimization for reading 1px for simple scenes of opaque rectangles" +#: ../cogl/cogl-debug-options.h:181 +msgid "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "অস্বচ্ছ আয়তসমূহৰ সাধাৰণ ছবিসমূহৰ বাবে 1px পঢ়াৰ অনুকূলীকৰণ অসামৰ্থবান কৰক" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "ক্লিপিং অনুকৰণ কৰক" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Cogl এ কিধৰণে ক্লিপিং প্ৰণয়ন কৰি আছে তাৰ বিষয়ে তথ্য লগ কৰে" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "পৰিৱেশন চিন্তাসমূহ অনুকৰণ কৰক" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "উপ-অনুকূলিত Cogl ব্যৱহাৰ উজ্জ্বলিত কৰে।" + +#~ msgid "Cogl debugging flags to set" +#~ msgstr "সংহতি কৰিবলে Cogl ডিবাগিং ফ্লেগসমূহ" + +#~ msgid "Cogl debugging flags to unset" +#~ msgstr "অসংহতি কৰিবলে Cogl ডিবাগিং ফ্লেগসমূহ" + +#~ msgid "Cogl Options" +#~ msgstr "Cogl বিকল্পসমূহ" + +#~ msgid "Show Cogl options" +#~ msgstr "Cogl বিকল্পসমূহ দেখুৱাওক" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/ast.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/ast.gmo differ diff -Nru cogl-1.22.0/po/ast.po cogl-1.22.2/po/ast.po --- cogl-1.22.0/po/ast.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/ast.po 2016-02-23 12:06:45.000000000 +0000 @@ -7,7 +7,7 @@ "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"POT-Creation-Date: 2012-03-05 23:14+0000\n" "PO-Revision-Date: 2011-09-11 18:52+0200\n" "Last-Translator: Xandru Armesto \n" "Language-Team: Softastur \n" @@ -20,341 +20,320 @@ "X-Poedit-Language: Asturian\n" "X-Poedit-SourceCharset: utf-8\n" -#: cogl/cogl-debug.c:181 +#: cogl/cogl-debug.c:172 msgid "Supported debug values:" msgstr "" -#: cogl/cogl-debug.c:186 +#: cogl/cogl-debug.c:177 msgid "Special debug values:" msgstr "" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: cogl/cogl-debug.c:179 cogl/cogl-debug.c:181 msgid "Enables all non-behavioural debug options" msgstr "" -#: cogl/cogl-debug.c:197 -msgid "Additional environment variables:" -msgstr "" - -#: cogl/cogl-debug.c:198 -msgid "Comma-separated list of GL extensions to pretend are disabled" -msgstr "" - -#: cogl/cogl-debug.c:200 -msgid "Override the GL version that Cogl will assume the driver supports" -msgstr "" - -#: cogl/cogl-debug.c:244 +#: cogl/cogl-debug.c:225 msgid "Cogl debugging flags to set" msgstr "Opciones de depuración de Cogl qu'activar" -#: cogl/cogl-debug.c:246 +#: cogl/cogl-debug.c:227 msgid "Cogl debugging flags to unset" msgstr "Opciones de depuración de Cogl que desactivar" -#: cogl/cogl-debug.c:295 +#: cogl/cogl-debug.c:276 msgid "Cogl Options" msgstr "Opciones de Cogl" -#: cogl/cogl-debug.c:296 +#: cogl/cogl-debug.c:277 msgid "Show Cogl options" msgstr "Amosar les opciones de Cogl" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: cogl/cogl-debug-options.h:25 cogl/cogl-debug-options.h:30 +#: cogl/cogl-debug-options.h:35 cogl/cogl-debug-options.h:40 +#: cogl/cogl-debug-options.h:45 cogl/cogl-debug-options.h:50 +#: cogl/cogl-debug-options.h:55 cogl/cogl-debug-options.h:61 +#: cogl/cogl-debug-options.h:66 cogl/cogl-debug-options.h:71 +#: cogl/cogl-debug-options.h:158 cogl/cogl-debug-options.h:163 +#: cogl/cogl-debug-options.h:168 cogl/cogl-debug-options.h:184 msgid "Cogl Tracing" msgstr "" -#: cogl/cogl-debug-options.h:34 +#: cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "" -#: cogl/cogl-debug-options.h:35 +#: cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "" -#: cogl/cogl-debug-options.h:39 +#: cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "" -#: cogl/cogl-debug-options.h:40 +#: cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "" -#: cogl/cogl-debug-options.h:44 +#: cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "" -#: cogl/cogl-debug-options.h:45 +#: cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "" -#: cogl/cogl-debug-options.h:49 +#: cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "" -#: cogl/cogl-debug-options.h:50 +#: cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "" -#: cogl/cogl-debug-options.h:54 +#: cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "" -#: cogl/cogl-debug-options.h:55 +#: cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "" -#: cogl/cogl-debug-options.h:59 +#: cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "" -#: cogl/cogl-debug-options.h:60 +#: cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "" -#: cogl/cogl-debug-options.h:64 +#: cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "" -#: cogl/cogl-debug-options.h:65 +#: cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "" -#: cogl/cogl-debug-options.h:70 +#: cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "" -#: cogl/cogl-debug-options.h:71 +#: cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "" -#: cogl/cogl-debug-options.h:75 +#: cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "" -#: cogl/cogl-debug-options.h:76 +#: cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "" -#: cogl/cogl-debug-options.h:80 +#: cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:81 +#: cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: cogl/cogl-debug-options.h:76 cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "" -#: cogl/cogl-debug-options.h:85 +#: cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "" -#: cogl/cogl-debug-options.h:86 +#: cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:90 +#: cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "" -#: cogl/cogl-debug-options.h:91 +#: cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: cogl/cogl-debug-options.h:86 cogl/cogl-debug-options.h:91 +#: cogl/cogl-debug-options.h:96 cogl/cogl-debug-options.h:101 +#: cogl/cogl-debug-options.h:111 cogl/cogl-debug-options.h:116 +#: cogl/cogl-debug-options.h:122 cogl/cogl-debug-options.h:127 +#: cogl/cogl-debug-options.h:132 cogl/cogl-debug-options.h:137 +#: cogl/cogl-debug-options.h:142 cogl/cogl-debug-options.h:147 +#: cogl/cogl-debug-options.h:153 cogl/cogl-debug-options.h:173 +#: cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "" -#: cogl/cogl-debug-options.h:95 +#: cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "" -#: cogl/cogl-debug-options.h:96 +#: cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "" -#: cogl/cogl-debug-options.h:100 +#: cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "" -#: cogl/cogl-debug-options.h:101 +#: cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:105 +#: cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "" -#: cogl/cogl-debug-options.h:106 +#: cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:110 +#: cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "" -#: cogl/cogl-debug-options.h:111 +#: cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:113 +#: cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "" -#: cogl/cogl-debug-options.h:115 +#: cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "" -#: cogl/cogl-debug-options.h:116 +#: cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "" -#: cogl/cogl-debug-options.h:120 +#: cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:121 +#: cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:125 +#: cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "" -#: cogl/cogl-debug-options.h:126 +#: cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." msgstr "" -#: cogl/cogl-debug-options.h:131 +#: cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "" -#: cogl/cogl-debug-options.h:132 +#: cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "" -#: cogl/cogl-debug-options.h:136 +#: cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "" -#: cogl/cogl-debug-options.h:137 +#: cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "" -#: cogl/cogl-debug-options.h:141 +#: cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "" -#: cogl/cogl-debug-options.h:142 +#: cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "" -#: cogl/cogl-debug-options.h:146 +#: cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "" -#: cogl/cogl-debug-options.h:147 +#: cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "" -#: cogl/cogl-debug-options.h:151 +#: cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "" -#: cogl/cogl-debug-options.h:152 +#: cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "" -#: cogl/cogl-debug-options.h:156 +#: cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "" -#: cogl/cogl-debug-options.h:157 +#: cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." msgstr "" -#: cogl/cogl-debug-options.h:162 +#: cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "" -#: cogl/cogl-debug-options.h:163 +#: cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" -#: cogl/cogl-debug-options.h:167 +#: cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "" -#: cogl/cogl-debug-options.h:168 +#: cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "" -#: cogl/cogl-debug-options.h:172 +#: cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "" -#: cogl/cogl-debug-options.h:173 +#: cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "" -#: cogl/cogl-debug-options.h:177 +#: cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:178 +#: cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:182 +#: cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "" -#: cogl/cogl-debug-options.h:183 +#: cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "" -#: cogl/cogl-debug-options.h:187 +#: cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "" -#: cogl/cogl-debug-options.h:188 +#: cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" -#: cogl/cogl-debug-options.h:193 +#: cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "" -#: cogl/cogl-debug-options.h:194 +#: cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "" - -#: cogl/cogl-debug-options.h:198 -msgid "Trace performance concerns" -msgstr "" - -#: cogl/cogl-debug-options.h:199 -msgid "Tries to highlight sub-optimal Cogl usage." -msgstr "" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/be.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/be.gmo differ diff -Nru cogl-1.22.0/po/be.po cogl-1.22.2/po/be.po --- cogl-1.22.0/po/be.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/be.po 2016-02-23 12:06:45.000000000 +0000 @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: cogl.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-09-25 23:19+0000\n" "PO-Revision-Date: 2012-09-26 15:09+0300\n" "Last-Translator: Kasia Bondarava \n" "Language-Team: Belarusian \n" @@ -18,226 +18,226 @@ "X-Generator: Virtaal 0.7.0\n" "X-Project-Style: gnome\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Вядомыя адладачныя значэнні:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Спецыяльныя адладачныя значэнні:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Уключыць усе непаводзінныя адладачныя параметры" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Дадатковыя зменныя асяроддзя:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "Спіс GL-пашырэнняў, падзеленых коскамі, якія трэба лічыць адсутнымі" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "Падмяніць версію GL, якую, на думку Cogl, падтрымлівае відэадрайвер" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:237 msgid "Cogl debugging flags to set" msgstr "Патрэбныя адладачныя сцяжкі Cogl" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:239 msgid "Cogl debugging flags to unset" msgstr "Непатрэбныя адладачныя сцяжкі Cogl" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:288 msgid "Cogl Options" msgstr "Опцыі Cogl" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:289 msgid "Show Cogl options" msgstr "Паказаваць опцыі Cogl" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Трасіраванне Cogl" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "Адсылкі CoglObject" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Адладжваць праблемы з лічэннем спасылак для CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Трасіраваць нарэзку тэкстур" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "адладжваць стварэнне зрэзаў тэкстур" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Трасіраваць атласныя тэкстуры" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Адладжваць кіраванне атласам тэкстур" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Трасіраваць бленд-стрынгі" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Адладжваць разбор CoglBlendString" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Трасіраваць журнал" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Праглядаць усе геаметрыі, якія праходзяць праз журнал" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Трасіраваць пакетаванне" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Паказваць, як геаметрыя пакетуецца ў журнале" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Трасіраваць матрыцы" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Трасіраваць усе матрычныя маніпуляцыі" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Трасіраваць рысаванне" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Трасіраваць разнастайныя рысавальныя аперацыі" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Трасіраваць рэндэрны модуль Pango" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Трасіраваць рэндэрны модуль Cogl Pango" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Трасіраваць бэкэнд CoglTexturePixmap" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Трасіраваць бэкэнд растравых тэкстур Cogl" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Візуалізаваць" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Вылучыць прамавугольнікі" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Дадаць каркас для ўсёй прамавугольнай геаметрыі" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Паказаць каркас" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Дадаць каркас для ўсёй геаметрыі" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Корань праблемы" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Выключыць журнальнае пакетаванне" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Выключыць пакетаванне геаметрыі ў журнале Cogl." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Выключыць вяршынныя буферы GL" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Выключыць выкарыстанне аб'ектаў вяршынных буфераў OpenGL" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Выключыць піксельныя буферы GL" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Выключыць выкарыстанне аб'ектаў піксельных буфераў OpenGL" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Выключыць праграмную трансфармацыю прамавугольнікаў" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Выкарыстоўваць GPU для трансфармацыі прамавугольнай геаметрыі" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Спецыяліст Cogl" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Стварыць атласны файл вобразу" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Стварыць файл вобразу са зменамі атласнай тэкстуры" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Выключыць атласаванне тэкстур" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Выключыць выкарыстанне" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "" "Выключыць супольнае выкарыстанне атласнай тэкстуры паміж тэкстам і выявамі" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -245,51 +245,51 @@ "Калі ўключана, кэш гліфаў заўсёды будзе выкарыстоўваць асобную тэкстуру для " "яго атласа. Іначай ён паспрабуе супольна выкарыстоўваць атлас з выявамі." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Выключыць тэкстураванне" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Выключыць тэкстураванне любых прымітываў" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Выключыць arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Выключыць выкарыстанне праграм з ARB-фрагментамі" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Выключыць фіксаваны канвеер" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Выключыць выкарыстанне бэкэнда з фіксаваным канвеерам функцый" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Выключыць GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Выключыць выкарыстанне GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Выключыць блендынг" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Выключыць блендынг" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Выключыць тэкстуры не другой ступені" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -297,70 +297,70 @@ "Прымусіць Cogl думаць, што GL-драйвер не падтрымлівае NPOT-тэкстур, а замест " "іх ствараць абрэзаныя тэкстуры ці тэкстуры са смеццем." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Выключыць праграмнае абразанне" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" "Выключыць спробы Cogl абрэзаць некаторыя прамавугольнікі ў праграмным рэжыме." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Паказаць выточны код" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Паказаць згенераваны выточны код ARBfp/GLSL" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Трасіраваць некаторыя функцыі OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Трасіраваць некаторыя выклікі OpenGL" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Трасіраваць падтрымку пазаэкраннага рэндэрынгу" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Адладжваць падтрымку пазаэкраннага рэндэрынгу" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Выключыць праграмны кэш" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Выключыць дапаможны кэш для праграм arbfp і glsl" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Выключыць аптымізацыю чытання піксела" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Выключыць аптымізацыю для чытання аднаго піксела ў простых сцэнах з " "непразрыстымі прамавугольнікамі" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Трасіраваць кліпінг" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Запісваць звесткі аб тым, як Cogl рэалізуе кліпінг" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Трасіраваць для вымярэння прадукцыйнасці" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Спрабуе вызначыць неаптымальнае выкарыстанне Cogl." Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/bg.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/bg.gmo differ diff -Nru cogl-1.22.0/po/bg.po cogl-1.22.2/po/bg.po --- cogl-1.22.0/po/bg.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/bg.po 2016-02-23 12:06:45.000000000 +0000 @@ -9,7 +9,7 @@ "Project-Id-Version: cogl cogl-1.12\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"POT-Creation-Date: 2012-10-02 05:27+0300\n" "PO-Revision-Date: 2012-10-02 05:27+0300\n" "Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" @@ -19,75 +19,75 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Поддържани нива на съобщенията за отстраняване на грешки:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Специални нива на съобщенията за отстраняване на грешки:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "" "Включване на всички флагове за изчистване на грешки освен тези за поведението" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Допълнителни променливи от обвивката:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "Списък с разширения на GL, които Cogl да приема, че липсват" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "" "Изрично задаване на версията на GL, която Cogl да приема, че драйверът " "поддържа" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:237 msgid "Cogl debugging flags to set" msgstr "Флагове за изчистване на грешки на cogl, които да се включат" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:239 msgid "Cogl debugging flags to unset" msgstr "Флагове за изчистване на грешки на cogl, които да се изключат" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:288 msgid "Cogl Options" msgstr "Опции на cogl" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:289 msgid "Show Cogl options" msgstr "Извеждане на опциите на cogl" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Трасиране на Cogl" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "Указатели към програмни обекти от вида „CoglObject“" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "" "Съобщения за отстраняване на грешки свързани с отчета на указателите към " "програмни обекти от вида „CoglObject“" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Трасиране на разрязването на текстури" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "" "Съобщения за отстраняване на грешки свързани със създаването на отрязъци от " @@ -95,11 +95,11 @@ # Става въпрос за изображения съдържащи всички текстури. # https://en.wikipedia.org/wiki/Texture_atlas -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Трасиране на атласите с текстури" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "" "Съобщения за отстраняване на грешки свързани с управлението на атласите с " @@ -108,162 +108,162 @@ # Става въпрос за специален формат низове в cogl, чрез които се задават # правилата, на комбиниране на текстурите – събиране, изваждане, # умножение и др. -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Трасиране на смесващите низове" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "" "Съобщения за отстраняване на грешки свързани с анализирането на " "„CoglBlendString“" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Журнал на трасирането" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Преглед на геометрията, минаваща през журнала" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Трасиране на пакетирането" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Показване на пакетирането за обработка на геометрията в журнала" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Трасиране на матрици" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "" "Съобщения за отстраняване на грешки свързани с операциите по обработка на " "матриците" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Трасиране на разни функции за изчертаване" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "" "Съобщения за отстраняване на грешки свързани с разни операции по изчертаване" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Трасиране на изобразяването чрез Pango" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "" "Съобщения за отстраняване на грешки свързани с изобразяването чрез Pango" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "" "Трасиране на подсистемата за обработка на текстури в паметта " "(CoglTexturePixmap)" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "" "Съобщения за отстраняване на грешки свързани с подсистемата на Cogl за " "oбработка на текстури в паметта" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Онагледяване" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Очертаване на правоъгълниците" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Очертаване на геометрията по правоъгълници" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Показване на контури" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Очертаване на контурите на всички обекти" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Първопричина" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Изключване на пакетирането в журнала" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Изключване на обработката по пакети на геометрията в журнала на Cogl." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Изключване на буферирането на върховете в GL" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Изключване на обектите за буфериране на върхове в OpenGL" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Изключване на буферирането на пикселите в GL" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Изключване на обектите за буфериране на пиксели в OpenGL" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Изключване на софтуерните трансформации по правоъгълници" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "" "Трансформациите по правоъгълници да се извършват от графичния процесор (GPU)" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Инструментариум на Cogl" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Записване на изображенията с атласите" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Записване на промените в атласите с текстури във файл" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Изключване на атласите с текстури" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Изключване на използването на атласи с текстури" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "" "Изключване на споделянето на атласите с текстури между изображения и текст" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -271,52 +271,52 @@ "Когато е включено, глифите ще използват отделна текстура като атлас. Когато " "е изключено, ще се направи опит за споделяне на атласа с изображенията." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Изключване на текстурите" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Изключване на текстурите за всички обекти" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Изключване програмите на ARB (arbfp)" # Справка: https://secure.wikimedia.org/wikipedia/en/wiki/ARB_%28GPU_assembly_language%29#ARB_fragment_program -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Спиране на използването на програмите за обработка на фрагменти на ARB" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Спиране на непроменяемите" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Спиране на ползването на ядрото с установени функции" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Изключване на GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Изключване на езика за графични програми на OpenGL (GLSL)" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Изключване на смесването" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Изключване на смесване" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Ползване само на текстури с размери степен на двойката" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -324,69 +324,69 @@ "Изключването на текстури с размери, които не са степен на двойката. Ще се " "използват отрязъци от текстури." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Изключване на софтуерното изрязване" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "Изключване на опитите на Cogl да изрязва софтуерно някои правоъгълници" -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Показване на кода" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Показване на генерирания код на ARBfp/GLSL" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Трасиране на OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Трасиране на определени извиквания на OpenGL" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Трасиране на поддръжката на буферите извън екрана" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Изчистване на грешките на поддръжката на буферите извън екрана" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Изключване на кеширането на програмите" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Изключване на резервното кеширане на програмите arbfp и glsl" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Изключване на оптимизациите при четене на пиксели" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Изключване на оптимизациите за прочитане на области от по 1 пиксел за прости " "сцени с непрозрачни правоъгълници" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Трасиране на изрязването" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Записване на информация как Cogl осъществява изрязването" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Проследяване на проблемите с бързодействието" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Опит за посочване на неоптималното ползване на Cogl." Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/bs.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/bs.gmo differ diff -Nru cogl-1.22.0/po/bs.po cogl-1.22.2/po/bs.po --- cogl-1.22.0/po/bs.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/bs.po 2016-02-23 12:06:45.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: cogl\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2015-02-27 04:11+0000\n" "PO-Revision-Date: 2015-02-04 15:39+0000\n" "Last-Translator: Samir Ribić \n" "Language-Team: Bosnian \n" @@ -14,225 +14,209 @@ "X-Launchpad-Export-Date: 2015-02-05 07:06+0000\n" "X-Generator: Launchpad (build 17331)\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:180 msgid "Supported debug values:" msgstr "Podržane vrijednosti za traženje grešaka:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:185 msgid "Special debug values:" msgstr "Posebne vrijednosti za traženje grešaka:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:187 ../cogl/cogl-debug.c:189 msgid "Enables all non-behavioural debug options" msgstr "Uključuje sve ne-ponašajuće opcije za traženje grešaka:" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:196 msgid "Additional environment variables:" msgstr "Dodatne varijable okruženja:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:197 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "Zarezima razdvojen popis GL proširenja koja se čini da su onemogućena" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:199 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "Prevaziđi GL verziju za koju će Gogl pretpostaviti da drajver podržava" -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:32 ../cogl/cogl-debug-options.h:37 +#: ../cogl/cogl-debug-options.h:42 ../cogl/cogl-debug-options.h:47 +#: ../cogl/cogl-debug-options.h:52 ../cogl/cogl-debug-options.h:57 +#: ../cogl/cogl-debug-options.h:62 ../cogl/cogl-debug-options.h:68 +#: ../cogl/cogl-debug-options.h:73 ../cogl/cogl-debug-options.h:78 +#: ../cogl/cogl-debug-options.h:165 ../cogl/cogl-debug-options.h:170 +#: ../cogl/cogl-debug-options.h:175 ../cogl/cogl-debug-options.h:191 +#: ../cogl/cogl-debug-options.h:196 msgid "Cogl Tracing" msgstr "Cogl praćenje" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:34 msgid "CoglObject references" msgstr "Reference objekta Cogl" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:35 msgid "Debug ref counting issues for CoglObjects" msgstr "Istraži probleme brojanja referenci za objekte Cogla" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:39 msgid "Trace Texture Slicing" msgstr "Prati isjecanje teksture" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:40 msgid "debug the creation of texture slices" msgstr "pročišćava stvaranje isječaka teksture" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:44 msgid "Trace Atlas Textures" msgstr "Prati alasne teksture" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:45 msgid "Debug texture atlas management" msgstr "Pročišćava upravljanje atlasom teksture" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:49 msgid "Trace Blend Strings" msgstr "Prati niske stapanja" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:50 msgid "Debug CoglBlendString parsing" msgstr "Pročišćava obrađivanje niski stapanja Cogla" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:54 msgid "Trace Journal" msgstr "Dnevnik praćenja" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:55 msgid "View all the geometry passing through the journal" msgstr "Pregledaj sve oblike koji prolaze kroz dnevnik" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:59 msgid "Trace Batching" msgstr "Prati grupisanje" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:60 msgid "Show how geometry is being batched in the journal" msgstr "Prikazuje kako oblik biva grupisan u dnevniku" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace matrices" msgstr "Prati matrice" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:65 msgid "Trace all matrix manipulation" msgstr "Prati sva rukovanja matricom" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:70 msgid "Trace Misc Drawing" msgstr "Prati razno crtanje" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:71 msgid "Trace some misc drawing operations" msgstr "Prati razne radnje crtanja" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:75 msgid "Trace Pango Renderer" msgstr "Prati Pango iscrtavača" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:76 msgid "Trace the Cogl Pango renderer" msgstr "Prati Kogl Pango iscrtavača" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:80 msgid "Trace CoglTexturePixmap backend" msgstr "Prati pozadinski program mape tačaka teksture Kogla" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:81 msgid "Trace the Cogl texture pixmap backend" msgstr "Prati pozadinski program mape tačaka teksture Kogla" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:83 ../cogl/cogl-debug-options.h:88 msgid "Visualize" msgstr "Vizualiziraj" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:85 msgid "Outline rectangles" msgstr "Pravougaonici konture" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:86 msgid "Add wire outlines for all rectangular geometry" msgstr "Dodaje žičane konture za sve pravougaone oblike" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:90 msgid "Show wireframes" msgstr "Prikaži žičane ramove" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:91 msgid "Add wire outlines for all geometry" msgstr "Dodaj žičane konture za sve oblike" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:93 ../cogl/cogl-debug-options.h:98 +#: ../cogl/cogl-debug-options.h:103 ../cogl/cogl-debug-options.h:108 +#: ../cogl/cogl-debug-options.h:118 ../cogl/cogl-debug-options.h:123 +#: ../cogl/cogl-debug-options.h:129 ../cogl/cogl-debug-options.h:134 +#: ../cogl/cogl-debug-options.h:139 ../cogl/cogl-debug-options.h:144 +#: ../cogl/cogl-debug-options.h:149 ../cogl/cogl-debug-options.h:154 +#: ../cogl/cogl-debug-options.h:160 ../cogl/cogl-debug-options.h:180 +#: ../cogl/cogl-debug-options.h:185 msgid "Root Cause" msgstr "Korijeni uzrok" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:95 msgid "Disable Journal batching" msgstr "Isključi grupisanje dnevnika" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:96 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Isključuje grupisanje oblika u dnevniku Cogla." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:100 msgid "Disable GL Vertex Buffers" msgstr "Isključi međumemorije za vrhove GL-a" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:101 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Isključuje korišćenje objekata međumemorije vrhova OpenGL-a" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:105 msgid "Disable GL Pixel Buffers" msgstr "Isključi međumemorije tačke GL-a" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:106 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Isključi korišćenje objekata međumemorije tačaka OpenGL-a" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:110 msgid "Disable software rect transform" msgstr "Isključi softversku transformaciju pravougaonika" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:111 msgid "Use the GPU to transform rectangular geometry" msgstr "Koristi grafički procesor za preobražavanje pravougaonog oblika" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:113 msgid "Cogl Specialist" msgstr "Specijalista Cogla" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:115 msgid "Dump atlas images" msgstr "Uskladišti slike atlasa" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:116 msgid "Dump texture atlas changes to an image file" msgstr "Skladišti izmjene atlasa teksture u datoteku slike" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:120 msgid "Disable texture atlasing" msgstr "Isključi atlasiranje teksture" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:121 msgid "Disable use of texture atlasing" msgstr "Isključuje upotrebu atlasiranja teksture" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable sharing the texture atlas between text and images" msgstr "Isključi dijeljenje atlasa teksture između teksta i slika" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:126 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -240,51 +224,51 @@ "Kada je ovo podešeno ostava simbola će uvijek koristiti odvojene teksture za " "svoj atlas. U suprotnom će pokušati da dijeli atlas sa slikama." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:131 msgid "Disable texturing" msgstr "Isključi prikaz tekstura" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:132 msgid "Disable texturing any primitives" msgstr "Isključuje prikaz tekstura bilo koje osnovne funkcije" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:136 msgid "Disable arbfp" msgstr "Isključi arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:137 msgid "Disable use of ARB fragment programs" msgstr "Isključuje upotrebu programa ARB odlomaka" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:141 msgid "Disable fixed" msgstr "Isključi stalnu" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:142 msgid "Disable use of the fixed function pipeline backend" msgstr "Isključuje upotrebu pozadinskog cjevovoda stalne funkcije" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:146 msgid "Disable GLSL" msgstr "Isključi GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:147 msgid "Disable use of GLSL" msgstr "Isključuje upotrebu GLSL-a" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:151 msgid "Disable blending" msgstr "Isključi stapanje" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:152 msgid "Disable use of blending" msgstr "Isključuje upotrebu stapanja" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:156 msgid "Disable non-power-of-two textures" msgstr "Isključi sklopove koji nisu stepen dvojke" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:157 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -292,69 +276,69 @@ "Čini da Cogl misli da GL upravljački program ne podržava NPOT sklopove tako " "da će napraviti isjeckane sklopove ili sklopove sa rasipanjem umjesto toga." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:162 msgid "Disable software clipping" msgstr "Isključi softversko odsjecanje" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:163 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "Isključuje Koglove pokušaje da odsječe neke pravougaonike u softveru." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:167 msgid "Show source" msgstr "Prikaži izvor" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:168 msgid "Show generated ARBfp/GLSL source code" msgstr "Prikazuje stvoreni ARBfp/GLSL izvorni kod" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:172 msgid "Trace some OpenGL" msgstr "Prati neki OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:173 msgid "Traces some select OpenGL calls" msgstr "Prati neke odabrane pozive OpenGL-a" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:177 msgid "Trace offscreen support" msgstr "Prati vanekransku podršku" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:178 msgid "Debug offscreen support" msgstr "Pročisti vanekransku podršku" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:182 msgid "Disable program caches" msgstr "Isključi ostave programa" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:183 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Isključuje ostave prebacivanja za arbfp i glsl programe" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:187 msgid "Disable read pixel optimization" msgstr "Isključi optimizaciju čitanja tačke" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:188 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Isključuje optimizaciju za čitanje 1 tačke za jednostavne scene neprozirnih " "pravougaonika" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:193 msgid "Trace clipping" msgstr "Prati odsijecanje" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:194 msgid "Logs information about how Cogl is implementing clipping" msgstr "Zapisuje podatke o tome kako Kogl primjenjuje odsjecanje" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:198 msgid "Trace performance concerns" msgstr "Praćenje problema performansi" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:199 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Pokušaj isticanja pod-optimalne Cogl upotrebe." Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/ca.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/ca.gmo differ diff -Nru cogl-1.22.0/po/ca.po cogl-1.22.2/po/ca.po --- cogl-1.22.0/po/ca.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/ca.po 2016-02-23 12:06:45.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-08-29 14:01+0000\n" "PO-Revision-Date: 2012-08-30 01:07+0200\n" "Last-Translator: Gil Forcada \n" "Language-Team: Catalan \n" @@ -20,231 +20,215 @@ "Content-Transfer-Encoding: 8bits\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Valors de depuració permesos:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Valors de depuració especials:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Habilita totes les opcions de depuració que no tinguin comportament" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Variables d'entorn addicionals:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "" "Llista separada per comes amb les extensions de GL que s'ha de fer veure que " "estan inhabilitades" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "" "Sobreescriu la versió de GL que la Cogl assumeix que implementa el " "controlador" -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "Senyaladors de depuració de la Cogl a definir" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "Senyaladors de depuració de la Cogl dels quals desfer-ne la definició" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "Opcions de la Cogl" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "Mostra les opcions de la Cogl" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Traçat de la Cogl" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "Referències a CoglObject" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Depura problemes de comptadors de referència per CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Traça el tallat de textures" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "depura la creació de talls de textura" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Traça els atles de textures" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Depura la gestió dels atles de textura" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Traça les cadenes de mescla" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Depura l'anàlisi de les CoglBlendString" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Traça el diari" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Visualitza tota la geometria que passa a través del diari" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Traça els lots" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Mostra com la geometria és tracta per lots en el diari" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Traça les matrius" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Traça totes les manipulacions de matrius" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Traça els diversos pintats" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Traça algunes operacions de pintat" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Traça el renderitzador de la Pango" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Traça el renderitzador de la Pango de la Cogl" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Traça el rerefons de la CoglTexturePixmap" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Traça el rerefons de textures del mapa de píxels de la Cogl" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Visualitza" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Rectangles externs" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Afegeix els esquelets de tota la geometria rectangular" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Mostra els esquelets" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Afegeix els esquelets de tota la geometria" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Causa arrel" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Inhabilita el processament per lots del diari" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "" "Inhabilita el processament per lots de la geometria en el diari de la Cogl." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Inhabilita les memòries intermèdies de vèrtexs de GL" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Inhabilita l'ús d'objectes de memòria intermèdia de vèrtexs d'OpenGL" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Inhabilita les memòries intermèdies de píxels de GL" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Inhabilita l'ús d'objectes de memòria intermèdia de píxels d'OpenGL" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Inhabilita la transformació rectangular per programari" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Utilitza la GPU per transformar la geometria regular" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Especialista de la Cogl" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Bolca les imatges d'atles" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Bolca en un fitxer d'imatge els canvis d'atles de textura" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Inhabilita la cartografia de les textures" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Inhabilita l'ús de cartografia en les textures" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "" "Inhabilita la compartició dels atles de textura entre el text i les imatges" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -252,51 +236,51 @@ "Si s'habilita se separarà sempre la memòria cau de glifs del seu atles. En " "cas contrari s'intentarà compartir l'atles amb les seves imatges." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Inhabilita la texturització" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Inhabilita qualsevol primitiva de texturització" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Inhabilita l'arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Inhabilita l'ús de fragments de programa ARB" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Inhabilita els fixos" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Inhabilita l'ús del rerefons del conducte de funció fixa" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Inhabilita el GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Inhabilita l'ús del GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Inhabilita la mescla" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Inhabilita l'ús de la mescla" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Inhabilita les textures que no siguin potència de dos" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -304,71 +288,84 @@ "Fa que la Cogl cregui que el controlador de GL no permet l'ús de textures " "NPOT de manera que crearà textures tallades o textures amb sobrants." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Inhabilita el retall per programari" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" "Inhabilita els intents de la Cogl de retallar alguns rectangles amb " "programari." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Mostra el codi font" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Mostra el codi font generat per ARBfp/GLSL" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Traça alguna part de l'OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Traça algunes crides seleccionades de l'OpenGL" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Traça l'ús fora de pantalla" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Depura l'ús fora de pantalla" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Inhabilita les memòries cau del programa" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Inhabilita les memòries cau de resguard pels programes arbfp i glsl" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Inhabilita l'optimització de lectura de píxels" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Inhabilita l'optimització per llegir 1px d'escenes senzilles de rectangles " "opacs" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Traça el tallat" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Registra informació sobre com la Cogl implementa el tallat" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Traça els problemes de rendiment" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Intenta ressaltar utilitzacions no òptimes de la Cogl." + +#~ msgid "Cogl debugging flags to set" +#~ msgstr "Senyaladors de depuració de la Cogl a definir" + +#~ msgid "Cogl debugging flags to unset" +#~ msgstr "" +#~ "Senyaladors de depuració de la Cogl dels quals desfer-ne la definició" + +#~ msgid "Cogl Options" +#~ msgstr "Opcions de la Cogl" + +#~ msgid "Show Cogl options" +#~ msgstr "Mostra les opcions de la Cogl" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/ca@valencia.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/ca@valencia.gmo differ diff -Nru cogl-1.22.0/po/ca@valencia.po cogl-1.22.2/po/ca@valencia.po --- cogl-1.22.0/po/ca@valencia.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/ca@valencia.po 2016-08-26 16:18:04.000000000 +0000 @@ -10,241 +10,225 @@ "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"POT-Creation-Date: 2012-09-18 01:43+0200\n" "PO-Revision-Date: 2012-08-30 01:07+0200\n" "Last-Translator: Gil Forcada \n" "Language-Team: Catalan \n" -"Language: ca-XV\n" +"Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bits\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Valors de depuració permesos:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Valors de depuració especials:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Habilita totes les opcions de depuració que no tinguen comportament" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Variables d'entorn addicionals:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "" "Llista separada per comes amb les extensions de GL que s'ha de fer veure que " "estan inhabilitades" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "" "Sobreescriu la versió de GL que la Cogl assumeix que implementa el " "controlador" -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "Senyaladors de depuració de la Cogl a definir" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "Senyaladors de depuració de la Cogl dels quals desfer-ne la definició" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "Opcions de la Cogl" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "Mostra les opcions de la Cogl" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Traçat de la Cogl" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "Referències a CoglObject" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Depura problemes de comptadors de referència per CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Traça el tallat de textures" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "depura la creació de talls de textura" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Traça els atles de textures" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Depura la gestió dels atles de textura" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Traça les cadenes de mescla" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Depura l'anàlisi de les CoglBlendString" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Traça el diari" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Visualitza tota la geometria que passa a través del diari" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Traça els lots" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Mostra com la geometria és tracta per lots en el diari" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Traça les matrius" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Traça totes les manipulacions de matrius" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Traça els diversos pintats" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Traça algunes operacions de pintat" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Traça el renderitzador de la Pango" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Traça el renderitzador de la Pango de la Cogl" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Traça el rerefons de la CoglTexturePixmap" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Traça el rerefons de textures del mapa de píxels de la Cogl" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Visualitza" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Rectangles externs" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Afig els esquelets de tota la geometria rectangular" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Mostra els esquelets" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Afig els esquelets de tota la geometria" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Causa arrel" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Inhabilita el processament per lots del diari" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "" "Inhabilita el processament per lots de la geometria en el diari de la Cogl." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Inhabilita les memòries intermèdies de vèrtexs de GL" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Inhabilita l'ús d'objectes de memòria intermèdia de vèrtexs d'OpenGL" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Inhabilita les memòries intermèdies de píxels de GL" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Inhabilita l'ús d'objectes de memòria intermèdia de píxels d'OpenGL" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Inhabilita la transformació rectangular per programari" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Utilitza la GPU per transformar la geometria regular" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Especialista de la Cogl" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Bolca les imatges d'atles" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Bolca en un fitxer d'imatge els canvis d'atles de textura" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Inhabilita la cartografia de les textures" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Inhabilita l'ús de cartografia en les textures" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "" "Inhabilita la compartició dels atles de textura entre el text i les imatges" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -252,51 +236,51 @@ "Si s'habilita se separarà sempre la memòria cau de glifs del seu atles. En " "cas contrari s'intentarà compartir l'atles amb les seues imatges." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Inhabilita la texturització" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Inhabilita qualsevol primitiva de texturització" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Inhabilita l'arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Inhabilita l'ús de fragments de programa ARB" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Inhabilita els fixos" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Inhabilita l'ús del rerefons del conducte de funció fixa" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Inhabilita el GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Inhabilita l'ús del GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Inhabilita la mescla" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Inhabilita l'ús de la mescla" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Inhabilita les textures que no siguen potència de dos" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -304,71 +288,84 @@ "Fa que la Cogl cregui que el controlador de GL no permet l'ús de textures " "NPOT de manera que crearà textures tallades o textures amb sobrants." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Inhabilita el retall per programari" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" "Inhabilita els intents de la Cogl de retallar alguns rectangles amb " "programari." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Mostra el codi font" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Mostra el codi font generat per ARBfp/GLSL" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Traça alguna part de l'OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Traça algunes crides seleccionades de l'OpenGL" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Traça l'ús fora de pantalla" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Depura l'ús fora de pantalla" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Inhabilita les memòries cau del programa" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Inhabilita les memòries cau de resguard pels programes arbfp i glsl" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Inhabilita l'optimització de lectura de píxels" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Inhabilita l'optimització per llegir 1px d'escenes senzilles de rectangles " "opacs" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Traça el tallat" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Registra informació sobre com la Cogl implementa el tallat" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Traça els problemes de rendiment" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Intenta ressaltar utilitzacions no òptimes de la Cogl." + +#~ msgid "Cogl debugging flags to set" +#~ msgstr "Senyaladors de depuració de la Cogl a definir" + +#~ msgid "Cogl debugging flags to unset" +#~ msgstr "" +#~ "Senyaladors de depuració de la Cogl dels quals desfer-ne la definició" + +#~ msgid "Cogl Options" +#~ msgstr "Opcions de la Cogl" + +#~ msgid "Show Cogl options" +#~ msgstr "Mostra les opcions de la Cogl" diff -Nru cogl-1.22.0/po/cogl.pot cogl-1.22.2/po/cogl.pot --- cogl-1.22.0/po/cogl.pot 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/cogl.pot 2016-08-26 17:36:30.000000000 +0000 @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the cogl package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: cogl 1.22.0\n" +"Project-Id-Version: cogl 1.22.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"POT-Creation-Date: 2016-08-26 18:36+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/cs.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/cs.gmo differ diff -Nru cogl-1.22.0/po/cs.po cogl-1.22.2/po/cs.po --- cogl-1.22.0/po/cs.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/cs.po 2016-02-23 12:06:45.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-09-29 16:02+0000\n" "PO-Revision-Date: 2012-10-01 19:41+0200\n" "Last-Translator: Marek Černocký \n" "Language-Team: Czech \n" @@ -20,228 +20,228 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Podporované ladicí hodnoty:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Speciální ladicí hodnoty:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Zapnout všechny ladicí volby, které se netýkají chování" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Dodatečné proměnné prostředí:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "" "Čárkami oddělený seznam rozšíření GL, u kterých se má předstírat, že jsou " "vypnutá" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "" "Verzi GL, o které se Cogl domnívá, že ji podporuje ovladač, přepsat na tuto" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:237 msgid "Cogl debugging flags to set" msgstr "Ladicí příznaky Cogl, které se mají nastavit" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:239 msgid "Cogl debugging flags to unset" msgstr "Ladicí příznaky Cogl, které se mají zrušit" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:288 msgid "Cogl Options" msgstr "Volby Cogl" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:289 msgid "Show Cogl options" msgstr "Zobrazit volby Cogl" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Sledování v Cogl" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "Odkazy CoglObject" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Ladit problémy s počítáním odkazů pro CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Sledovat plátování textur" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "ladit tvorbu texturových plátů" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Sledovat atlasové textury" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Ladit správu texturového atlasu" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Sledovat mísení řetězců" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Ladit zpracován CoglBlendString" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Sledovat žurnál" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Zobrazit veškeré geometrické útvary procházející skrze žurnál" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Sledovat dávkové zpracování" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Sledovat, jak jsou geometrické útvary zpracovány v žurnálu po dávkách" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Sledovat matice" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Sledovat veškerou manipulaci s maticemi" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Sledovat různá kreslení" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Sledovat některé různorodé kreslící operace" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Sledovat vykreslování Pango" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Sledovat vykreslování Cogl Pango" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Sledovat výkonné jádro CoglTexturePixmap" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Sledovat výkoné jádro pixmapových textur Cogl" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Vizualizovat" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Obrysové obdélníky" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Přidat drátěný obrys ke všem obdélníkům" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Drátěné zobrazení" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Přidat drátěný obrys ke všem útvarům" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Základní věci" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Zakázat dávkové zpracování v žurnálu" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Zakázat dávkové zpracování geometrických útvarů v žurnálu Cogl" -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Vypnout vyrovnávací paměti vertexů GL" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Vypnout používání objektů vyrovnávacích pamětí vertexů GL" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Vypnout vyrovnávací paměti pixelů GL" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Vypnout používání objektů vyrovnávacích pamětí pixelů GL" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Zakázat softwarovou transformaci obdélníků" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Použít grafický adaptér k transformacím obdélníků" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Pro odborníky na Cogl" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Ukládat obrázky atlasu" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Ukládat změny texturového atlasu do obrázkového souboru" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Zakázat atlasování textur" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Zakázat tvorbu atlasu z textur" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "Zakázat sdílení texturového atlasu mezi textem a obrázky" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -249,51 +249,51 @@ "Pokud je nastaveno, paměť znaků bude vždy používat oddělenou texturu pro " "svůj atlas. V opačném případě se bude snažit sdílet atlas s obrázky." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Zakázat potažení texturami" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Zakázat potažení texturami u všech primitiv" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Zakázat arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Zakázat použití fragmentovacích programů ARB" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Zakázat pevné" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Zakázat použití výkonného jádra s rourou pevných funkcí" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Zakázat GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Zakázat používaní GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Zakázat mísení" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Zakázat použití mísení (blending)" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Zakázat textury typu NPOT" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -302,69 +302,69 @@ "různými od mocnin dvojky. Textury se buď rozdělí na pláty nebo bude vznikat " "prázdný prostor." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Zakázat softwarové ořezávání" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "Zákázat pokusy o softwarový ořez některých obdélníků" -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Zobrazit zdrojový kód" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Zobrazit vytvořený zdrojový kód ARBfp/GLSL" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Sledovat něco z OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Sledovat některá vybraná volání OpenGL" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Sledovat podporu mimoobrazovkového vykreslování" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Ladit podporu mimoobrazovkévého vykreslování (offscreen)" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Zakázat mezipaměť programů" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Zakázat nouzovou mezipaměť pro programy arbfp a glsl" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Vypnout optimalizaci čtení pixelu" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Vypnout optimalizaci pro čtení 1 pixelu u jednoduchých scén z neprůhledných " "čtyřúhelníků" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Sledovat ořezávání" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Zapisovat informace, jak Cogl provádí ořezy" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Sledovat výkonostní aspekty" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Zkusit zdůraznit suboptimální využití Cogl" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/da.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/da.gmo differ diff -Nru cogl-1.22.0/po/da.po cogl-1.22.2/po/da.po --- cogl-1.22.0/po/da.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/da.po 2016-02-23 12:06:45.000000000 +0000 @@ -10,7 +10,7 @@ "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"POT-Creation-Date: 2012-09-16 13:12+0200\n" "PO-Revision-Date: 2012-09-16 00:17+0200\n" "Last-Translator: Ask Hjorth Larsen \n" "Language-Team: Danish \n" @@ -20,226 +20,210 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Understøttede fejlfindingsværdier:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Specielle fejlfindingsværdier:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Aktiverer alle ikke-opførsels-fejlfindingsvalgmuligheder" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Yderligere miljøvariable:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "" "Kommaadskilt liste af GL-udvidelser som vi forestiller os er deaktiveret" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "Tilsidesæt GL-versionen som Cogl vil antage at driveren understøtter" -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "Cogl fejlfindingsflag der skal angives" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "Cogl fejlfindingsflag der skal fjernes" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "Cogl-tilvalg" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "Vis Cogl-tilvalg" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Cogl-sporing" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "CoglObject-referencer" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Fejlfind referencetællingsproblemer for CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Spor teksturopskæring" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "fejlfind dannelsen af teksturskiver" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Spor atlasteksturer" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Fejlfind tekstur-atlashåndtering" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Spor blanding af strenge" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Fejlfind tolkning af CoglBlendString" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Spor journal" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Se al geometri som passerer gennem journalen" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Spor gruppering" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Vis hvordan geometri som passerer gennem journalen grupperes" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Spor matricer" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Spor al matrixmanipulation" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Spor diverse tegneoperationer" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Spor visse generelle tegneoperationer" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Spor Pango-rendering" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Spor Cogls Pango-rendering" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Spor det underliggende CoglTexturePixmap-program" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Spor Cogls underliggende teksturpixmap-program" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Visualisér" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Omrids rektangler" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Tilføj trådomrids for alle rektangulære geometrier" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Vis trådrammer" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Tilføj trådomrids for alle geometrier" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Underliggende årsag" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Deaktivér journalgruppering" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Deaktivér gruppering af geometri i Cogl-journalen." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Deaktivér GL-hjørnebuffere" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Deaktivér brugen af OpenGL-hjørnebufferobjekter" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Deaktivér GL-pixelbuffere" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Deaktivér brugen af OpenGL-pixelbufferobjekter" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Deaktivér software-rekt.-transformation" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Brug GPU'en til at transformere rektangulær geometri" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Cogl-specialist" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Smid atlasbilleder" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Smid teksturatlasændringer til en billedfil" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Deaktivér teksturatlasering" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Deaktivér brugen af teksturatlasering" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "Deaktivér deling af teksturatlasset mellem tekst og billeder" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -247,53 +231,53 @@ "Når dette er sat, vil glyfcachen altid bruge en separat tekstur til dens " "atlas, ellers vil den prøve at dele atlasset med billederne." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Deaktivér teksturering" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Deaktivér teksturering af alle primitive" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Deaktivér arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Deaktivér brugen af ARB-fragmentprogrammer" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Deaktivér fastlåste" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "" "Deaktivér brugen af det underliggende datakanalsprogram med fastlåste " "funktioner" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Deaktivér GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Deaktivér brugen af GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Deaktivér blanding" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Deaktivér brugen af blanding" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Deaktiver ikke-anden-potens-teksturer" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -302,69 +286,81 @@ "teksturer, så den vil danne teksturer som skiver, eller teksturer med spild " "i stedet." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Deaktivér softwareklipning" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "Deaktivér Cogls forsøg på at klippe visse rektangler i software." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Vis kilde" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Vis genereret ARBfp/GLSL-kildekode" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Spor OpenGL delvist" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Spor visse udvalgte OpenGL-kald" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Spor uden-for-skærmen-understøttelse" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Fejlfind uden-for-skærmen-understøttelse" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Deaktivér programcacher" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Deaktivér reservecacher for arbfp- og glsl-programmer" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Deaktivér læs-pixel-optimering" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Deaktivér optimering for at læse 1px for simple scener af uigennemsigtige " "rektangler" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Spor klipning" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Logger information om hvordan Cogl implementerer klipning" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Ydelsesbekymringer angående spor" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Prøver at fremhæve ikke-optimal brug af Cogl." + +#~ msgid "Cogl debugging flags to set" +#~ msgstr "Cogl fejlfindingsflag der skal angives" + +#~ msgid "Cogl debugging flags to unset" +#~ msgstr "Cogl fejlfindingsflag der skal fjernes" + +#~ msgid "Cogl Options" +#~ msgstr "Cogl-tilvalg" + +#~ msgid "Show Cogl options" +#~ msgstr "Vis Cogl-tilvalg" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/de.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/de.gmo differ diff -Nru cogl-1.22.0/po/de.po cogl-1.22.2/po/de.po --- cogl-1.22.0/po/de.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/de.po 2016-02-23 12:06:45.000000000 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-09-07 13:16+0000\n" "PO-Revision-Date: 2012-09-23 14:16+0100\n" "Last-Translator: Mario Blättermann \n" "Language-Team: Deutsch \n" @@ -25,232 +25,216 @@ "X-Poedit-Country: GERMANY\n" "X-Generator: Gtranslator 2.91.5\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Unterstützte Werte zur Fehlerdiagnose:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Spezielle Werte zur Fehlerdiagnose:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "" "Alle nicht-verhaltensmäßigen Einstellungen zur Fehlerdiagnose aktivieren" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Zusätzliche Umgebungsvariablen:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "" "Durch Kommata getrennte Liste der GL-Erweiterungen, die als deaktiviert " "vorgegeben sind" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "" "Die GL-Version überschreiben, von welcher Cogl annimmt, dass der Treiber sie " "unterstützt" -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "Zu setzende Cogl-Fehlerdiagnose-Flags" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "Zurückzusetzende Cogl-Fehlerdiagnose-Flags" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "Cogl-Einstellungen" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "Cogl-Einstellungen anzeigen" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Cogl-Tracing" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "CoglObject-Referenzen" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Ref-Counting Probleme for CoglObjects diagnostizieren" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Textur-Slicing verfolgen" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "Die Erstellung von Textur-Scheiben diagnostizieren" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Atlas-Texturen verfolgen" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Textur-Atlas-Verwaltung Diagnostizieren" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Blend-Strings verfolgen" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Verarbeitung von CoglBlendString diagnostizieren" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Journal verfolgen" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Alle Geometrie-Weitergaben durch das Journal anzeigen" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Batching verfolgen" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Anzeigen, wie Geometrie im Journal eingereiht wird" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Matrizen verfolgen" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Alle Matrix-Manipulationen verfolgen" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Zeichnung verfolgen" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Einige Zeichenvorgänge verfolgen" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Pango-Renderer verfolgen" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Den Cogl Pango-Renderer verfolgen" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "CoglTexturePixmap-Backend verfolgen" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Das Cogl Textur-pixmap-Backend verfolgen" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Darstellen" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Rechtecke umranden" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Umrandungen zu allen rechteckigen geometrischen Formen hinzufügen" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Drahtgitter anzeigen" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Umrandungen zu allen geometrischen Formen hinzufügen" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Hauptursache" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Journal-Stapelung ausschalten" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Einreihen von Geometrie im Cogl-Journal deaktivieren." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "GL-Vertex-Puffer deaktivieren" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "OpenGL-Vertex-Pufferobjekte nicht verwenden" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "GL-Pixel-Puffer deaktivieren" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "OpenGL-Pixel-Pufferobjekte nicht verwenden" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Softwaretransformation von Rechtecken deaktivieren" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "" "Den Grafikprozessor zur Transformation rechteckiger geometrischer Formen " "verwenden" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Cogl-Spezialist" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Atlas-Bilder ausgeben" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Änderungen am Textur-Atlas in eine Bilddatei ausgeben" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Textur-Atlasing ausschalten" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Verwendung des Textur-Atlasing ausschalten" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "Teilen des Textur-Atlas zwischen Text und Bildern deaktivieren" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -259,55 +243,55 @@ "separate Textur für seinen Atlas nutzen. Ansonsten wird versucht, den Atlas " "mit den Bildern zu teilen." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Texturierung deaktivieren" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Texturierung jeglicher Primitiven deaktivieren" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "ARBFP deaktivieren" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Verwendung von ARB-Fragment-Programmen deaktivieren" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Fixierte deaktivieren" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Verwendung des Backends für feste Funktions-Pipeline deaktivieren" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "GLSL deaktivieren" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Verwendung von GLSL deaktivieren" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Blending deaktivieren" # Aus den OpenGL-FAQs: # Blending is OpenGL's mechanism for combining color already in the framebuffer with the color of the incoming primitive. The result of this combination is then stored back in the framebuffer. # Würde ich als Begriff so lassen. -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Blending nicht verwenden" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Nicht-Zweierpotenz-Texturen deaktivieren" # Siehe http://developer.gnome.org/cogl/stable/cogl-Textures.html -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -316,70 +300,82 @@ "unterstützt, sodass es stattdessen geschnittene Texturen oder Texturen mit " "Datenmüll erzeugt." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Software-Clipping deaktivieren" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" "Versuche von Cogl deaktivieren, Rechtecke softwaretechnisch zu beschneiden." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Quelltext anzeigen" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Erstellten ARBFP/GLSL-Quelltext anzeigen" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "OpenGL verfolgen" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Einige OpenGL-Aufrufe verfolgen" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Offscreen-Unterstützung verfolgen" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Offscreen-Unterstützung diagnostizieren" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Programm-Zwischenspeicher deaktivieren" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Rückfall-Zwischenspeicher für arbfp- und glsl-Programme deaktivieren" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Optimierung zum Lesen von Pixeln deaktivieren" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Optimierung zum Lesen von 1px für einfache Szenen mit voll deckenden " "Rechtecken deaktivieren" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Clipping verfolgen" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Protokolliert Informationen, wie Cogl Clipping implementiert" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Leistungsbelange verfolgen" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Versucht suboptimale Nutzung von Cogl aufzuzeigen." + +#~ msgid "Cogl debugging flags to set" +#~ msgstr "Zu setzende Cogl-Fehlerdiagnose-Flags" + +#~ msgid "Cogl debugging flags to unset" +#~ msgstr "Zurückzusetzende Cogl-Fehlerdiagnose-Flags" + +#~ msgid "Cogl Options" +#~ msgstr "Cogl-Einstellungen" + +#~ msgid "Show Cogl options" +#~ msgstr "Cogl-Einstellungen anzeigen" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/el.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/el.gmo differ diff -Nru cogl-1.22.0/po/el.po cogl-1.22.2/po/el.po --- cogl-1.22.0/po/el.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/el.po 2016-02-23 12:06:45.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-09-26 02:01+0000\n" "PO-Revision-Date: 2012-09-26 11:15+0200\n" "Last-Translator: Tom Tryfonidis \n" "Language-Team: team@gnome.gr\n" @@ -22,229 +22,229 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Virtaal 0.6.1\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Υποστηριζόμενες τιμές αποσφαλμάτωσης:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Ειδικές τιμές αποσφαλμάτωσης" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Ενεργοποιεί όλες τις επιλογές μη συμπεριφορικής αποσφαλμάτωσης" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Επιπρόσθετες μεταβλητές περιβάλλοντος" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "" "Λίστα πρόσθετων GL χωρισμένα με κόμματα για να προσποιούνται πως είναι " "απενεργοποιημένα" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "" "Παράκαμψη της έκδοσης GL όπου το Cogl θα υποθέσει την υποστήριξη του οδηγού" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:237 msgid "Cogl debugging flags to set" msgstr "Ενεργοποίηση σημαιών αποσφαλμάτωσης Cogl" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:239 msgid "Cogl debugging flags to unset" msgstr "Απενεργοποίηση σημαιών αποσφαλμάτωσης Cogl" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:288 msgid "Cogl Options" msgstr "Επιλογές Cogl" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:289 msgid "Show Cogl options" msgstr "Εμφάνιση επιλογών Cogl" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Εντοπισμός Cogl" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "Αναφορές του CoglObject" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Αποσφαλμάτωση αναφορά καταμέτρησης ζητημάτων για το CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Ανίχνευση τεμαχισμoύ Υφής" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "αποσφαλμάτωση της δημιουργίας τεμαχισμoύ υφής" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Ανίχνευση υφών Atlas" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Αποσφαλμάτωση διαχείρισης υφών atlas" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Ανίχνευση Σσυμβολοσειρών Blend" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Αποσφαλμάτωση ανάλυσης CoglBlendString" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Ανίχνευση αναφοράς" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Προβολή όλης της γεωμετρίας που διέρχεται από την αναφορά" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Ανίχνευση ουράς ενεργειών" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Προβολή γεωμετρίας της ουράς ενεργειών στην αναφορά" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Ανίχνευση πινάκων" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Εντοπισμός όλων των χειραγωγήσεων πινάκων" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Ανίχνευση διάφορων σχεδίων" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Ανίχνευση διάφορων λειτουργιών σχεδίων" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Ανίχνευση απεικoνιστή Pango" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Ανίχνευση του απεικoνιστή Cogl Pango" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Ανίχνευση συστήματος υποστήριξης CoglTexturePixmap" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Ανίχνευση συστήματος υποστήριξης Cogl Texture Pixmap" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Απεικόνιση" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Περίγραμμα ορθογωνίων" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Προσθήκη γραμμικών περιγραμμάτων για όλα τα ορθογώνια" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Εμφάνιση γραμμικών σχημάτων" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Προσθήκη γραμμικών περιγραμμάτων σε όλη τη γεωμετρία" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Βασική αιτία" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Απενεργοποίηση αναφοράς ουράς ενεργειών" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Απενεργοποίηση ουράς ενεργειών γεωμετρίας στην αναφορά Cogl." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Απενεργοποίηση ρυθμιστών GL Vertex" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Απενεργοποίηση όλων των ρυθμιστών OpenGL Vertex" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Απενεργοποίηση ρυθμιστών GL Pixel" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Απενεργοποίηση όλων των ρυθμιστών OpenGL Pixel" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Απενεργοποίηση του μετασχηματισμού λογισμικού rect" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Χρήση του GPU για τον μετασχηματισμό της ορθογώνιας γεωμετρίας" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Ειδικός Cogl" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Απόρριψη εικόνων atlas" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Απόρριψη αλλαγών των υφών atlas σε αρχείο απεικόνισης" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Απενεργοποίηση ατλαντοποίησης υφών" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Απενεργοποίηση χρήσης της ατλαντοποίησης υφών" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "" "Απενεργοποίηση κοινής χρήσης της υφής atlas μεταξύ κειμένου και εικόνων" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -252,51 +252,51 @@ "Όταν αυτό έχει οριστεί η μνήμη glyph cache θα χρησιμοποιεί μια ξεχωριστή υφή " "για atlas. Διαφορετικά, θα προσπαθεί να μοιραστεί το atlas με εικόνες." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Απενεργοποίηση δημιουργίας υφών" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Απενεργοποίηση δημιουργίας υφών των αρχέτυπων" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Απενεργοποίηση arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Απενεργοποίηση χρήσης σκελίδων λογισμικού ARB" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Απενεργοποίηση καθορισμένων" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Απενεργοποίηση χρήσης της καθορισμένης ρουτίνας συστήματος υποστήριξης" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Απενεργοποίηση του GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Απενεργοποίηση χρήσης του GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Απενεργοποίηση blending" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Απενεργοποίηση χρήσης του blending" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Απενεργοποίηση μη-τετραγωνικών υφών" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -304,71 +304,71 @@ "Κάνει το Cogl να βλέπει ότι ο οδηγός GL δέν υποστηρίζει υφές NOPT ώστε αντ' " "αυτού θα δημιουργεί υφές φέτες ή υφές με σκουπίδια." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Απενεργοποίηση περικοπής λογισμικού" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" "Απενεργοποιεί τις προσπάθειες του cogl να περικόψει κάποια ορθογώνια στο " "λογισμικό." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Προβολή πηγής" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Προβολή δημιουργηθέντος πηγαίου κώδικα ARBfp/GLSL" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Ανίχνευση OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Ανιχνεύει κάποια OpenGL calls" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Ανίχνευση υποστήριξης offscreen" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Αποσφαλμάτωση υποστήριξης offscreen" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Απενεργοποίηση μνήμης cache προγραμμάτων" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Απενεργοποίηση αναδίπλωσης μνήμης cache για arbfp και glsl προγράμματα" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Απενεργοποίηση βελτιστοποίησης read pixel" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Απενεργοποίηση βελτιστοποίησης για την ανάγνωση 1px για απλές σκηνές " "αδιαφανών ορθογωνίων" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Ανίχνευση περικοπών" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Καταγραφή πληροφοριών σχετικά με το πώς το Cogl εφαρμόζει περικοπές" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Ανησυχίες επιδόσεων ανίχνευσης " -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Προσπαθεί να αναδείξει την υποβέλτιστη χρήση του Cogl." Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/en_CA.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/en_CA.gmo differ diff -Nru cogl-1.22.0/po/en_CA.po cogl-1.22.2/po/en_CA.po --- cogl-1.22.0/po/en_CA.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/en_CA.po 2016-02-23 12:06:45.000000000 +0000 @@ -8,7 +8,7 @@ "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"POT-Creation-Date: 2012-03-05 23:14+0000\n" "PO-Revision-Date: 2011-09-16 19:12-0400\n" "Last-Translator: Tiffany Antopolski \n" "Language-Team: Canadian English\n" @@ -18,341 +18,320 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cogl/cogl-debug.c:181 +#: cogl/cogl-debug.c:172 msgid "Supported debug values:" msgstr "" -#: cogl/cogl-debug.c:186 +#: cogl/cogl-debug.c:177 msgid "Special debug values:" msgstr "" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: cogl/cogl-debug.c:179 cogl/cogl-debug.c:181 msgid "Enables all non-behavioural debug options" msgstr "" -#: cogl/cogl-debug.c:197 -msgid "Additional environment variables:" -msgstr "" - -#: cogl/cogl-debug.c:198 -msgid "Comma-separated list of GL extensions to pretend are disabled" -msgstr "" - -#: cogl/cogl-debug.c:200 -msgid "Override the GL version that Cogl will assume the driver supports" -msgstr "" - -#: cogl/cogl-debug.c:244 +#: cogl/cogl-debug.c:225 msgid "Cogl debugging flags to set" msgstr "Cogl debugging flags to set" -#: cogl/cogl-debug.c:246 +#: cogl/cogl-debug.c:227 msgid "Cogl debugging flags to unset" msgstr "Cogl debugging flags to unset" -#: cogl/cogl-debug.c:295 +#: cogl/cogl-debug.c:276 msgid "Cogl Options" msgstr "Cogl Options" -#: cogl/cogl-debug.c:296 +#: cogl/cogl-debug.c:277 msgid "Show Cogl options" msgstr "Show Cogl options" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: cogl/cogl-debug-options.h:25 cogl/cogl-debug-options.h:30 +#: cogl/cogl-debug-options.h:35 cogl/cogl-debug-options.h:40 +#: cogl/cogl-debug-options.h:45 cogl/cogl-debug-options.h:50 +#: cogl/cogl-debug-options.h:55 cogl/cogl-debug-options.h:61 +#: cogl/cogl-debug-options.h:66 cogl/cogl-debug-options.h:71 +#: cogl/cogl-debug-options.h:158 cogl/cogl-debug-options.h:163 +#: cogl/cogl-debug-options.h:168 cogl/cogl-debug-options.h:184 msgid "Cogl Tracing" msgstr "" -#: cogl/cogl-debug-options.h:34 +#: cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "" -#: cogl/cogl-debug-options.h:35 +#: cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "" -#: cogl/cogl-debug-options.h:39 +#: cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "" -#: cogl/cogl-debug-options.h:40 +#: cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "" -#: cogl/cogl-debug-options.h:44 +#: cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "" -#: cogl/cogl-debug-options.h:45 +#: cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "" -#: cogl/cogl-debug-options.h:49 +#: cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "" -#: cogl/cogl-debug-options.h:50 +#: cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "" -#: cogl/cogl-debug-options.h:54 +#: cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "" -#: cogl/cogl-debug-options.h:55 +#: cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "" -#: cogl/cogl-debug-options.h:59 +#: cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "" -#: cogl/cogl-debug-options.h:60 +#: cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "" -#: cogl/cogl-debug-options.h:64 +#: cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "" -#: cogl/cogl-debug-options.h:65 +#: cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "" -#: cogl/cogl-debug-options.h:70 +#: cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "" -#: cogl/cogl-debug-options.h:71 +#: cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "" -#: cogl/cogl-debug-options.h:75 +#: cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "" -#: cogl/cogl-debug-options.h:76 +#: cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "" -#: cogl/cogl-debug-options.h:80 +#: cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:81 +#: cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: cogl/cogl-debug-options.h:76 cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "" -#: cogl/cogl-debug-options.h:85 +#: cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "" -#: cogl/cogl-debug-options.h:86 +#: cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:90 +#: cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "" -#: cogl/cogl-debug-options.h:91 +#: cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: cogl/cogl-debug-options.h:86 cogl/cogl-debug-options.h:91 +#: cogl/cogl-debug-options.h:96 cogl/cogl-debug-options.h:101 +#: cogl/cogl-debug-options.h:111 cogl/cogl-debug-options.h:116 +#: cogl/cogl-debug-options.h:122 cogl/cogl-debug-options.h:127 +#: cogl/cogl-debug-options.h:132 cogl/cogl-debug-options.h:137 +#: cogl/cogl-debug-options.h:142 cogl/cogl-debug-options.h:147 +#: cogl/cogl-debug-options.h:153 cogl/cogl-debug-options.h:173 +#: cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "" -#: cogl/cogl-debug-options.h:95 +#: cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "" -#: cogl/cogl-debug-options.h:96 +#: cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "" -#: cogl/cogl-debug-options.h:100 +#: cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "" -#: cogl/cogl-debug-options.h:101 +#: cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:105 +#: cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "" -#: cogl/cogl-debug-options.h:106 +#: cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:110 +#: cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "" -#: cogl/cogl-debug-options.h:111 +#: cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:113 +#: cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "" -#: cogl/cogl-debug-options.h:115 +#: cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "" -#: cogl/cogl-debug-options.h:116 +#: cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "" -#: cogl/cogl-debug-options.h:120 +#: cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:121 +#: cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:125 +#: cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "" -#: cogl/cogl-debug-options.h:126 +#: cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." msgstr "" -#: cogl/cogl-debug-options.h:131 +#: cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "" -#: cogl/cogl-debug-options.h:132 +#: cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "" -#: cogl/cogl-debug-options.h:136 +#: cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "" -#: cogl/cogl-debug-options.h:137 +#: cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "" -#: cogl/cogl-debug-options.h:141 +#: cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "" -#: cogl/cogl-debug-options.h:142 +#: cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "" -#: cogl/cogl-debug-options.h:146 +#: cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "" -#: cogl/cogl-debug-options.h:147 +#: cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "" -#: cogl/cogl-debug-options.h:151 +#: cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "" -#: cogl/cogl-debug-options.h:152 +#: cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "" -#: cogl/cogl-debug-options.h:156 +#: cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "" -#: cogl/cogl-debug-options.h:157 +#: cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." msgstr "" -#: cogl/cogl-debug-options.h:162 +#: cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "" -#: cogl/cogl-debug-options.h:163 +#: cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" -#: cogl/cogl-debug-options.h:167 +#: cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "" -#: cogl/cogl-debug-options.h:168 +#: cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "" -#: cogl/cogl-debug-options.h:172 +#: cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "" -#: cogl/cogl-debug-options.h:173 +#: cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "" -#: cogl/cogl-debug-options.h:177 +#: cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:178 +#: cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:182 +#: cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "" -#: cogl/cogl-debug-options.h:183 +#: cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "" -#: cogl/cogl-debug-options.h:187 +#: cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "" -#: cogl/cogl-debug-options.h:188 +#: cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" -#: cogl/cogl-debug-options.h:193 +#: cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "" -#: cogl/cogl-debug-options.h:194 +#: cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "" - -#: cogl/cogl-debug-options.h:198 -msgid "Trace performance concerns" -msgstr "" - -#: cogl/cogl-debug-options.h:199 -msgid "Tries to highlight sub-optimal Cogl usage." -msgstr "" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/en_GB.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/en_GB.gmo differ diff -Nru cogl-1.22.0/po/en_GB.po cogl-1.22.2/po/en_GB.po --- cogl-1.22.0/po/en_GB.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/en_GB.po 2016-02-23 12:06:45.000000000 +0000 @@ -5,9 +5,9 @@ msgid "" msgstr "" "Project-Id-Version: cogl\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"Report-Msgid-Bugs-To: " +"http://bugzilla.gnome.org/enter_bug.cgi?product=clutter\n" +"POT-Creation-Date: 2012-09-05 19:32+0100\n" "PO-Revision-Date: 2012-09-05 19:32+0100\n" "Last-Translator: Bruce Cowan \n" "Language-Team: British English \n" @@ -19,225 +19,209 @@ "X-Generator: Virtaal 0.7.1\n" "X-Project-Style: gnome\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Supported debug values:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Special debug values:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Enables all non-behavioural debug options" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Additional environment variables:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "Comma-separated list of GL extensions to pretend are disabled" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "Override the GL version that Cogl will assume the driver supports" -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "Cogl debugging flags to set" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "Cogl debugging flags to unset" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "Cogl Options" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "Show Cogl options" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Cogl Tracing" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "CoglObject references" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Debug ref counting issues for CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Trace Texture Slicing" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "debug the creation of texture slices" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Trace Atlas Textures" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Debug texture atlas management" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Trace Blend Strings" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Debug CoglBlendString parsing" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Trace Journal" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "View all the geometry passing through the journal" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Trace Batching" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Show how geometry is being batched in the journal" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Trace matrices" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Trace all matrix manipulation" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Trace Misc Drawing" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Trace some misc drawing operations" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Trace Pango Renderer" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Trace the Cogl Pango renderer" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Trace CoglTexturePixmap backend" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Trace the Cogl texture pixmap backend" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Visualise" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Outline rectangles" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Add wire outlines for all rectangular geometry" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Show wireframes" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Add wire outlines for all geometry" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Root Cause" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Disable Journal batching" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Disable batching of geometry in the Cogl Journal." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Disable GL Vertex Buffers" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Disable use of OpenGL vertex buffer objects" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Disable GL Pixel Buffers" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Disable use of OpenGL pixel buffer objects" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Disable software rect transform" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Use the GPU to transform rectangular geometry" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Cogl Specialist" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Dump atlas images" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Dump texture atlas changes to an image file" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Disable texture atlasing" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Disable use of texture atlasing" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "Disable sharing the texture atlas between text and images" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -245,51 +229,51 @@ "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Disable texturing" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Disable texturing any primitives" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Disable arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Disable use of ARB fragment programs" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Disable fixed" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Disable use of the fixed function pipeline backend" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Disable GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Disable use of GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Disable blending" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Disable use of blending" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Disable non-power-of-two textures" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -297,68 +281,80 @@ "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Disable software clipping" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "Disables Cogl's attempts to clip some rectangles in software." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Show source" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Show generated ARBfp/GLSL source code" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Trace some OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Traces some select OpenGL calls" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Trace offscreen support" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Debug offscreen support" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Disable program caches" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Disable fallback caches for arbfp and glsl programs" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Disable read pixel optimisation" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Disable optimisation for reading 1px for simple scenes of opaque rectangles" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Trace clipping" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Logs information about how Cogl is implementing clipping" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Trace performance concerns" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Tries to highlight sub-optimal Cogl usage." + +#~ msgid "Cogl debugging flags to set" +#~ msgstr "Cogl debugging flags to set" + +#~ msgid "Cogl debugging flags to unset" +#~ msgstr "Cogl debugging flags to unset" + +#~ msgid "Cogl Options" +#~ msgstr "Cogl Options" + +#~ msgid "Show Cogl options" +#~ msgstr "Show Cogl options" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/eo.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/eo.gmo differ diff -Nru cogl-1.22.0/po/eo.po cogl-1.22.2/po/eo.po --- cogl-1.22.0/po/eo.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/eo.po 2016-02-23 12:06:45.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-06-05 14:41+0000\n" "PO-Revision-Date: 2012-06-07 21:23+0200\n" "Last-Translator: Kristjan SCHMIDT \n" "Language-Team: Esperanto \n" @@ -20,341 +20,325 @@ "X-Generator: Launchpad (build 15353)\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Suptenataj sencimigaj valoroj:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Specialaj sencimigaj valoroj:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "" -#: cogl/cogl-debug.c:197 -msgid "Additional environment variables:" -msgstr "" - -#: cogl/cogl-debug.c:198 -msgid "Comma-separated list of GL extensions to pretend are disabled" -msgstr "" - -#: cogl/cogl-debug.c:200 -msgid "Override the GL version that Cogl will assume the driver supports" -msgstr "" - -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "Enŝaltotaj sencimig-flagoj de Cogl" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "Elŝaltotaj sencimig-flagoj de Cogl" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "Opcioj de Cogl" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "Montri la opciojn de Cogl" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Bildigi" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "" -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." msgstr "" -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Elŝalti teksturadon" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Elŝalti na ARBFP" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Elŝalti na GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." msgstr "" -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Montri fonton" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "" + +#~ msgid "Cogl debugging flags to set" +#~ msgstr "Enŝaltotaj sencimig-flagoj de Cogl" + +#~ msgid "Cogl debugging flags to unset" +#~ msgstr "Elŝaltotaj sencimig-flagoj de Cogl" + +#~ msgid "Cogl Options" +#~ msgstr "Opcioj de Cogl" + +#~ msgid "Show Cogl options" +#~ msgstr "Montri la opciojn de Cogl" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/es.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/es.gmo differ diff -Nru cogl-1.22.0/po/es.po cogl-1.22.2/po/es.po --- cogl-1.22.0/po/es.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/es.po 2016-08-26 16:18:04.000000000 +0000 @@ -8,240 +8,224 @@ msgstr "" "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-08-06 09:17+0000\n" "PO-Revision-Date: 2012-08-07 20:17+0200\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español \n" -"Language: \n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 2.91.5\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Valores de depuración soportados:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Valores especiales de depuración:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Activa todas las opciones de depuración sin comportamiento" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Variables de entorno adicionales:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "" "Lista de las extensiones de GL separadas por comas que se pretenden " "desactivar" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "Omitir la versión de GL que Cogl asumirá que soporta el driver" -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "Opciones de depuración de Cogl que activar" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "Opciones de depuración de Cogl que desactivar" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "Opciones de Cogl" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "Mostrar las opciones de Cogl" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Rastreo de Cogl" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "Referencias de CoglObject" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Depurar problemas de conteo de referencias para CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Rastrear el troceado de texturas" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "depurar la creación de troceado de texturas" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Rastrear texturas atlas" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Gestión de la depuración de texturas atlas" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Rastrear cadenas de mezclado" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Análisis de depuración de CoglBlendString" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Rastrear diario" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Ver toda la geometría que pasa a través del diario" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Rastrear procesado por lotes" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Mostrar cómo se procesa por lotes la geometría en el diario" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Rastrear matrices" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Rastrear toda la manipulación de matrices" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Rastrear dibujado variado" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Rastrear algunas operaciones de dibujado variadas" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Rastrear dibujado Pango" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Rastrear el dibujado Pango de Cogl" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Rastrear el backend de CoglTexturePixmap" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Rastrear el «backend» del mapa de píxeles de la textura de Cogl" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Visualizar" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Esbozar rectángulos" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Añadir trazos de líneas para toda la geometría rectangular" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Mostrar trazados de líneas (wireframes)" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Añadir trazos de líneas para toda la geometría" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Causa raíz" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Desactivar el procesado por lotes en el diario" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "" "Desactivar el procesado por lotes de la geometría en el diario de Cogl." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Desactivar los búferes vertex de GL" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Desactivar el uso de objetos de búfer vertex de OpenGL" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Desactivar los búferes de píxel GL" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Desactivar el uso de objetos de búfer de píxeles de OpenGL" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Desactivar la transformación de rectas por software" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Usar la GPU para transformar geometría rectangular" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Especialista de Cogl" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Volcar atlas de imágenes" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Volcar cambios en la textura de atlas a un archivo de imagen" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Desactivar los atlas de texturas" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Desactivar el uso de atlas de texturas" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "Desactivar la compartición de atlas de texturas entre texto e imágenes" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -250,51 +234,51 @@ "separada para su atlas. De otro modo, intentará compartir el atlas con las " "imágenes." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Desactivar texturizado" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Desactivar el texturizado de cualquier primitiva" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Desactivar arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Desactivar el uso de programas de fragmentos ARB" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Desactivar la función fija" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Desactivar el uso del «backend» de la tubería de la función fija" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Desactivar GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Desactivar el uso de GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Desactivar la mezcla" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Desactivar el uso de la mezcla" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Desactivar las texturas que no sean potencias de dos" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -302,71 +286,83 @@ "Hace que Cogl crea que el driver de GL no soporta texturas NPOT, por lo que " "creará texturas troceadas o texturas con residuos" -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Desactivar rectorte software" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" "Desactiva los intentos de Cogl de recortar algunos rectángulos en software." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Mostrar fuente" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Mostrar el código fuente ARBfp/GLSL generado" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Rastrear algunas OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Rastrea algunas llamadas OpenGL seleccionadas" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Rastrear soporte para fuera de la pantalla" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Depurar soporte para fuera de la pantalla" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Desactivar las cachés de los programas" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Desactivar las cachés alternativas para programas arbfp y glsl" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Desactivar optimización de lectura de píxel" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Desactivar la optimización de lectura de 1px para escenas simples de " "rectángulos opacos" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Rastrear recortes" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "" "Información de los registros acerca de cómo implementa Cogl los recortes" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Rastrear problemas de rendimiento" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Intenta resaltar el uso no óptimo de Cogl" + +#~ msgid "Cogl debugging flags to set" +#~ msgstr "Opciones de depuración de Cogl que activar" + +#~ msgid "Cogl debugging flags to unset" +#~ msgstr "Opciones de depuración de Cogl que desactivar" + +#~ msgid "Cogl Options" +#~ msgstr "Opciones de Cogl" + +#~ msgid "Show Cogl options" +#~ msgstr "Mostrar las opciones de Cogl" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/eu.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/eu.gmo differ diff -Nru cogl-1.22.0/po/eu.po cogl-1.22.2/po/eu.po --- cogl-1.22.0/po/eu.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/eu.po 2016-02-23 12:06:45.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: cogl.po.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-04-03 23:06+0200\n" "PO-Revision-Date: 2013-04-03 23:10+0200\n" "Last-Translator: Iñaki Larrañaga Murgoitio \n" "Language-Team: Basque \n" @@ -20,227 +20,227 @@ "X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Arazketaren onartutako balioak:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Arazketaren balio bereziak:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Egitekorik ez duten arazketaren aukera guztiak gaitzen ditu" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Inguruneko aldagai gehigarriak:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "" "GL hedapenen komaz bereiztutako zerrenda desgaituta daudela itxura egiteko" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "" "Gainidatzi GL bertsioa kontrolatzaileak onartzen duela Cogl-ek uste izateko" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:237 msgid "Cogl debugging flags to set" msgstr "Cogl-en arazketaren banderak ezartzeko" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:239 msgid "Cogl debugging flags to unset" msgstr "Cogl arazketarako banderak kentzeko" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:288 msgid "Cogl Options" msgstr "Cogl-en aukerak" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:289 msgid "Show Cogl options" msgstr "Erakutsi Cogl-en aukerak" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Cogl-en aztarnen jarraipena" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "CoglObject-en erreferentziak" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "CoglObjects-en erreferentziak zenbatzeko arazoen arazketa" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Testura zatitzailearen aztarna" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "Araztu testura zatien sorrera" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Atlas testuren aztarna" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Araztu atlas testuraren kudeaketa" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Nahasketaren kateen aztarna" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Araztu CoglBlendString analisia" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Egunkariaren aztarna" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Ikusi egunkaritik zehar doan geometria guztia" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Batch tratamenduaren aztarna" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Erakutsi geometria nola lantzen den batch bidez egunkarian" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Matrizeen aztarna" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Matrizeen manipulazio guztiaren aztarnak jarraitu" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Hainbat marrazkiren aztarna" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Marrazketaren eragiketa desberdin batzuen aztarnak jarraitu" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Pango errendatzailearen aztarna" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Cogl-en Pango errendatzailearen aztarnak jarraitu" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "CoglTexturePixmap motorraren aztarna" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Cogl-en testuren pixmapen motorraren aztarnak jarraitu" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Bistaratu" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Ingerada laukizuzenei" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Gehitu harizko ingeradak laukizuzen motako geometria guztiei" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Erakutsi burdin-haria" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Gehitu harizko ingeradak geometria guztiei" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Kausa nagusia" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Desgaitu egunkarian batch-ean lantzea" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Desgaitu geometriaren batch prozesua Cogl-ren egunkarian." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Desgaitu GL Vertex bufferrak" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Desgaitu OpenGL vertex-en bufferreko objektuak erabiltzea" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Desgaitu GL Pixel bufferrak" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Desgaitu OpenGL pixelen bufferreko objektuak erabiltzea" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Desgaitu laukizuzena software bidez eraldatzea" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Erabili PUGa laukizuzenen geometria eraldatzeko" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Cogl-en aditua" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Irauli atlas irudiak" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Irauli atlas testuren aldaketak irudi-fitxategi batera" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Desgaitu atlas testurak" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Desgaitu atlas testurak erabiltzea" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "Desgaitu atlas testurak testu eta irudien artean partekatzea" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -248,51 +248,51 @@ "Hau ezartzen denean, glifoen cachea beti erabiliko du bereiztutako testura " "bat bere atlas-arentzako. Bestela, atlas-a irudiekin partekatzen saiatuko da." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Desgaitu testurak" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Desgaitu testurak edozein primitibotan" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Desgaitu arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Desgaitu ARB zatien programak erabiltzea" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Desgaitu finkatua" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Desgaitu finkatutako funtzioaren kanalizazioaren motorra erabiltzea" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Desgaitu GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Desgaitu GLSL erabiltzea" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Desgaitu nahastea" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Desgaitu nahasketa erabiltzea" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Desgaitu biren berredurarik gabeko testurak" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -301,69 +301,70 @@ "eri, eta ondorioz, zatitutako testurak edo zaborrak dituzten testurak " "sortuko ditu." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Desgaitu software bidez moztea" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "Desgaitu Cogl-eren saiakerak laukizuzen batzuk software bidez mozteko" -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Erakutsi iturburua" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Erakutsi sortutako ARBfp/GLSL iturburuaren kodea" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "OpenGL batzuen aztarna" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Hautatutako OpenGL dei batzuen aztarnak jarraitu" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Pantailaz kanpoko euskarriaren aztarna" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Araztu pantailaz kanpoko euskarria" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Desgaitu programaren cacheak" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Desgaitu arbfp eta glsl programen modu seguruaren cacheak" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Desgaitu pixel irakurketa optimizatzea" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Desgaitu optimizazioa laukizuzen opakoren eszena bakunen 1px irakurtzeko" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Mozketaren aztarna" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "" "Cogl-ek mozketa nola lantzen duen buruzko informazioa erregistratzen du" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Errendimenduaren arazoen aztarnak" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Cogl-ren erabilera azpi-optimoa nabarmentzen saiatzen da" + Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/fa.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/fa.gmo differ diff -Nru cogl-1.22.0/po/fa.po cogl-1.22.2/po/fa.po --- cogl-1.22.0/po/fa.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/fa.po 2016-08-26 16:18:04.000000000 +0000 @@ -8,11 +8,11 @@ "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"POT-Creation-Date: 2012-03-05 23:14+0000\n" "PO-Revision-Date: 2011-09-06 11:26+0330\n" "Last-Translator: Arash Mousavi \n" "Language-Team: Persian\n" -"Language: \n" +"Language: fa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,341 +20,320 @@ "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n" "X-Poedit-SourceCharset: utf-8\n" -#: cogl/cogl-debug.c:181 +#: cogl/cogl-debug.c:172 msgid "Supported debug values:" msgstr "" -#: cogl/cogl-debug.c:186 +#: cogl/cogl-debug.c:177 msgid "Special debug values:" msgstr "" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: cogl/cogl-debug.c:179 cogl/cogl-debug.c:181 msgid "Enables all non-behavioural debug options" msgstr "" -#: cogl/cogl-debug.c:197 -msgid "Additional environment variables:" -msgstr "" - -#: cogl/cogl-debug.c:198 -msgid "Comma-separated list of GL extensions to pretend are disabled" -msgstr "" - -#: cogl/cogl-debug.c:200 -msgid "Override the GL version that Cogl will assume the driver supports" -msgstr "" - -#: cogl/cogl-debug.c:244 +#: cogl/cogl-debug.c:225 msgid "Cogl debugging flags to set" msgstr "پرچم‌های اشکال‌زدایی کوگل جهت تنظیم" -#: cogl/cogl-debug.c:246 +#: cogl/cogl-debug.c:227 msgid "Cogl debugging flags to unset" msgstr "پرچم‌های اشکال‌زدایی کوگل جهت خارج کردن از تنظیم" -#: cogl/cogl-debug.c:295 +#: cogl/cogl-debug.c:276 msgid "Cogl Options" msgstr "گزینه‌های کوگل" -#: cogl/cogl-debug.c:296 +#: cogl/cogl-debug.c:277 msgid "Show Cogl options" msgstr "نمایش گزینه‌های کوگل" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: cogl/cogl-debug-options.h:25 cogl/cogl-debug-options.h:30 +#: cogl/cogl-debug-options.h:35 cogl/cogl-debug-options.h:40 +#: cogl/cogl-debug-options.h:45 cogl/cogl-debug-options.h:50 +#: cogl/cogl-debug-options.h:55 cogl/cogl-debug-options.h:61 +#: cogl/cogl-debug-options.h:66 cogl/cogl-debug-options.h:71 +#: cogl/cogl-debug-options.h:158 cogl/cogl-debug-options.h:163 +#: cogl/cogl-debug-options.h:168 cogl/cogl-debug-options.h:184 msgid "Cogl Tracing" msgstr "" -#: cogl/cogl-debug-options.h:34 +#: cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "" -#: cogl/cogl-debug-options.h:35 +#: cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "" -#: cogl/cogl-debug-options.h:39 +#: cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "" -#: cogl/cogl-debug-options.h:40 +#: cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "" -#: cogl/cogl-debug-options.h:44 +#: cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "" -#: cogl/cogl-debug-options.h:45 +#: cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "" -#: cogl/cogl-debug-options.h:49 +#: cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "" -#: cogl/cogl-debug-options.h:50 +#: cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "" -#: cogl/cogl-debug-options.h:54 +#: cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "" -#: cogl/cogl-debug-options.h:55 +#: cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "" -#: cogl/cogl-debug-options.h:59 +#: cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "" -#: cogl/cogl-debug-options.h:60 +#: cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "" -#: cogl/cogl-debug-options.h:64 +#: cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "" -#: cogl/cogl-debug-options.h:65 +#: cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "" -#: cogl/cogl-debug-options.h:70 +#: cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "" -#: cogl/cogl-debug-options.h:71 +#: cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "" -#: cogl/cogl-debug-options.h:75 +#: cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "" -#: cogl/cogl-debug-options.h:76 +#: cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "" -#: cogl/cogl-debug-options.h:80 +#: cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:81 +#: cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: cogl/cogl-debug-options.h:76 cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "" -#: cogl/cogl-debug-options.h:85 +#: cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "" -#: cogl/cogl-debug-options.h:86 +#: cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:90 +#: cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "" -#: cogl/cogl-debug-options.h:91 +#: cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: cogl/cogl-debug-options.h:86 cogl/cogl-debug-options.h:91 +#: cogl/cogl-debug-options.h:96 cogl/cogl-debug-options.h:101 +#: cogl/cogl-debug-options.h:111 cogl/cogl-debug-options.h:116 +#: cogl/cogl-debug-options.h:122 cogl/cogl-debug-options.h:127 +#: cogl/cogl-debug-options.h:132 cogl/cogl-debug-options.h:137 +#: cogl/cogl-debug-options.h:142 cogl/cogl-debug-options.h:147 +#: cogl/cogl-debug-options.h:153 cogl/cogl-debug-options.h:173 +#: cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "" -#: cogl/cogl-debug-options.h:95 +#: cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "" -#: cogl/cogl-debug-options.h:96 +#: cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "" -#: cogl/cogl-debug-options.h:100 +#: cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "" -#: cogl/cogl-debug-options.h:101 +#: cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:105 +#: cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "" -#: cogl/cogl-debug-options.h:106 +#: cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:110 +#: cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "" -#: cogl/cogl-debug-options.h:111 +#: cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:113 +#: cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "" -#: cogl/cogl-debug-options.h:115 +#: cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "" -#: cogl/cogl-debug-options.h:116 +#: cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "" -#: cogl/cogl-debug-options.h:120 +#: cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:121 +#: cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:125 +#: cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "" -#: cogl/cogl-debug-options.h:126 +#: cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." msgstr "" -#: cogl/cogl-debug-options.h:131 +#: cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "" -#: cogl/cogl-debug-options.h:132 +#: cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "" -#: cogl/cogl-debug-options.h:136 +#: cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "" -#: cogl/cogl-debug-options.h:137 +#: cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "" -#: cogl/cogl-debug-options.h:141 +#: cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "" -#: cogl/cogl-debug-options.h:142 +#: cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "" -#: cogl/cogl-debug-options.h:146 +#: cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "" -#: cogl/cogl-debug-options.h:147 +#: cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "" -#: cogl/cogl-debug-options.h:151 +#: cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "" -#: cogl/cogl-debug-options.h:152 +#: cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "" -#: cogl/cogl-debug-options.h:156 +#: cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "" -#: cogl/cogl-debug-options.h:157 +#: cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." msgstr "" -#: cogl/cogl-debug-options.h:162 +#: cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "" -#: cogl/cogl-debug-options.h:163 +#: cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" -#: cogl/cogl-debug-options.h:167 +#: cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "" -#: cogl/cogl-debug-options.h:168 +#: cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "" -#: cogl/cogl-debug-options.h:172 +#: cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "" -#: cogl/cogl-debug-options.h:173 +#: cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "" -#: cogl/cogl-debug-options.h:177 +#: cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:178 +#: cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:182 +#: cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "" -#: cogl/cogl-debug-options.h:183 +#: cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "" -#: cogl/cogl-debug-options.h:187 +#: cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "" -#: cogl/cogl-debug-options.h:188 +#: cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" -#: cogl/cogl-debug-options.h:193 +#: cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "" -#: cogl/cogl-debug-options.h:194 +#: cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "" - -#: cogl/cogl-debug-options.h:198 -msgid "Trace performance concerns" -msgstr "" - -#: cogl/cogl-debug-options.h:199 -msgid "Tries to highlight sub-optimal Cogl usage." -msgstr "" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/fr.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/fr.gmo differ diff -Nru cogl-1.22.0/po/fr.po cogl-1.22.2/po/fr.po --- cogl-1.22.0/po/fr.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/fr.po 2016-08-26 16:18:04.000000000 +0000 @@ -9,241 +9,241 @@ msgstr "" "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-09-26 02:01+0000\n" "PO-Revision-Date: 2012-04-30 18:04+0100\n" "Last-Translator: Pierre Henry \n" "Language-Team: GNOME French team \n" -"Language: \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Valeurs de débogage prises en charge :" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Valeurs de débogage spéciales :" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Active toutes les options de débogage non-associées au comportement" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Variables d'environnement supplémentaires :" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "" "Liste d'extensions GL séparées par des points-virgules pour lesquelles il " "faut faire comme si elles étaient désactivées" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "" "Passer outre la version de GL que Cogl supposera que le pilote prend en " "charge" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:237 msgid "Cogl debugging flags to set" msgstr "Drapeaux de débogage Cogl à définir" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:239 msgid "Cogl debugging flags to unset" msgstr "Drapeaux de débogage Cogl à annuler" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:288 msgid "Cogl Options" msgstr "Options Cogl" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:289 msgid "Show Cogl options" msgstr "Affiche les options Cogl" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Traçage de Cogl" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "Références CoglObject" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Débogue les problèmes de comptage de référence pour les CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Tracer le découpage des texture" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "Débogue la création des tranches de texture" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Tracer les textures atlas" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Débogue la gestion des textures atlas" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Tracer les chaînes de Blend" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Débogue l'analyse des CoglBlendString" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Tracer le journal" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Affiche toute la géométrie transmise au journal" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Tracer le traitement par lot" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Affiche comment la géométrie est traitée par lot dans le journal" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Tracer les matrices" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Trace toutes les manipulations de matrice" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Tracer les dessins divers" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Trace des opérations de dessin divers" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Tracer le rendu Pango" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Trace le rendu Pango de Cogl" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Tracer le moteur CoglTexturePixmap" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Trace le moteur pixmap des textures Cogl" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Visualiser" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Entourer les rectangles" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Ajoute des contours filaires à toute géométrie rectangulaire" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Afficher les structures en mode filaire" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Ajoute des contours filaires à toute géométrie" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Cause principale" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Désactiver le traitement par lot du journal" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Désactive le traitement par lot de la géométrie dans le journal Cogl." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Désactiver les buffers des sommets GL" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Désactive l'utilisation des objets du buffer des sommets OpenGL" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Désactiver les buffers des pixels GL" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Désactive l'utilisation des objets du buffer des pixels OpenGL" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Désactiver la transformation rectangulaire du logiciel" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "" "Utilise le processeur graphique pour transformer la géométrie rectangulaire" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Spécialiste Cogl" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Vider les images de l'atlas" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Vide les modifications de l'atlas des textures dans un fichier d'image" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Désactiver l'enregistrement dans l'atlas des textures" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Désactive l'utilisation de l'enregistrement dans l'atlas des textures" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "" "Désactiver le partage de l'atlas des textures entre le texte et les images" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -252,51 +252,51 @@ "une texture séparée pour son atlas. Autrement, elle tentera de partager " "l'atlas avec les images." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Désactiver l'utilisation de texture" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Désactive l'utilisation de texture pour toute primitive" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Désactiver arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Désactive l'utilisation de programmes fragmentés ARB" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Désactiver fixés" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Désactive l'utilisation du moteur de pipeline de la fonction fixée" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Désactiver GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Désactive l'utilisation de GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Désactiver les mélanges" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Désactive l'utilisation des mélanges" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Désactiver les textures non-puissance de deux" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -304,72 +304,72 @@ "Fait penser à Cogl que le pilote GL ne supporte pas les textures NPOT pour " "qu'il crée des textures tranchées ou des textures avec les déchets." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Désactiver la coupure logiciel" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" "Empêche toute tentative de Cogl de couper certains rectangles dans les " "logiciels." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Afficher la source" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Affiche le code source ARBfp/GLSL produit" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Tracer quelques OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Trace quelques appels OpenGL sélectionnés" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Tracer la prise en charge hors-écran" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Débogue la prise en charge hors-écran" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Désactiver les caches de programme" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Désactive les caches d'urgence pour les programmes arbfp et glsl" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Désactiver l'optimisation de lecture de pixel" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Désactive l'optimisation de la lecture d'un pixel de scènes simples de " "rectangles opaques" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Tracer la coupure" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "" "Enregistre les informations sur la façon dont Cogl met en œuvre la coupure" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Tracer les problèmes de performances" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Essaie de mettre en évidence l'utilisation sous-optimale de Cogl." Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/gl.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/gl.gmo differ diff -Nru cogl-1.22.0/po/gl.po cogl-1.22.2/po/gl.po --- cogl-1.22.0/po/gl.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/gl.po 2016-02-23 12:06:45.000000000 +0000 @@ -13,7 +13,7 @@ "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"POT-Creation-Date: 2012-08-16 23:25+0200\n" "PO-Revision-Date: 2012-08-15 21:15+0200\n" "Last-Translator: Leandro Regueiro \n" "Language-Team: Galego \n" @@ -24,227 +24,213 @@ "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: Lokalize 1.0\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Valores de depuración admitidos:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Valores de depuración especiais:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Activa todas as opcións de depuración que non son de comportamento" -#: cogl/cogl-debug.c:197 -msgid "Additional environment variables:" -msgstr "Variábeis de ambiente adicionais:" - -#: cogl/cogl-debug.c:198 -msgid "Comma-separated list of GL extensions to pretend are disabled" -msgstr "" -"Lista separada por comas de extensións de GL que se vai supoñer que están " -"desactivadas" - -#: cogl/cogl-debug.c:200 -msgid "Override the GL version that Cogl will assume the driver supports" -msgstr "Anula a versión de GL que Cogl asumirá que o controlador admite" - -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:227 msgid "Cogl debugging flags to set" msgstr "Opcións de depuración de Cogl que activar" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:229 msgid "Cogl debugging flags to unset" msgstr "Opcións de depuración de Cogl que desactivar" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:278 msgid "Cogl Options" msgstr "Opcións de Cogl" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:279 msgid "Show Cogl options" msgstr "Mostrar as opcións de Cogl" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Rastrexar Cogl" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "Referencias de CoglObject" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Depurar problemas de conta de referencias para CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Rastrexar a segmentación de texturas" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "depurar a creación de segmentos de texturas" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Rastrexar texturar atlas" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Depurar a xestión de texturas atlas" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Rastrexar cadeas de mestura" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Depurar a análise de CoglBlendString" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Rastrexar diario" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Ver toda a xeometría que pasa a través do diario" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Rastrexar proceso por lotes" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Mostrar como se procesa por lotes a xeometría no diario" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Rastrexar matrices" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Rastrexar toda a manipulación de matrices" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Rastrexar debuxo variado" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Rastrexar algunhas operacións de debuxo variadas" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Rastrexar o debuxo de Pango" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Rastrexar o debuxo de Pango de Cogl" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Rastrexar a infraestrutura CoglTexturePixmap" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Rastrexar a infraestrutura do mapa de píxeles da textura de Cogl" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Visualizar" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Debuxar o contorno dos rectángulos" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Engadir contorno de trazos para toda a xeometría rectangular" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Mostrar trazos de liñas (wireframes)" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Engadir contorno de trazos para toda a xeometría" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Causa raíz" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Desactivar o proceso por lotes no diario" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Desactivar o proceso por lotes da xeometría no diario de Cogl." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Desactivar os búferes vertex de GL" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Desactivar o uso de obxectos de búfer vertex de OpenGL" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Desactivar os búferes de píxel GL" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Desactivar o uso de obxectos de búfer de píxeles de OpenGL" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Desactivar a transformación de rectas por software" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Usar a GPU para transformar xeometría rectangular" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Especialista de Cogl" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Envorcar atlas de imaxes" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Envorcar os cambios na textura de atlas nun ficheiro de imaxe" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Desactivar os atlas de texturas" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Desactivar o uso de atlas de texturas" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "Desactivar a compartición de atlas de texturas entre texto e imaxes" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -252,51 +238,51 @@ "Cando isto está definido, a caché de glyph usará sempre unha textura " "separada para o seu atlas. Senón tentará compartir o atlas coas imaxes." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Desactivar texturizado" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Desactivar texturizado de calquera primitiva" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Desactivar arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Desactivar o uso de programas de fragmentos ARB" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Desactivar a función fixa" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Desactivar o uso da infraestrutura da tubería da función fixa" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Desactivar GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Desactivar o uso de GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Desactivar a mestura" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Desactivar o uso de mestura" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Desactivar as texturas que non sexan potencias de dous" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -304,70 +290,81 @@ "Fai que Cogl crea que o controlador de GL non admite texturas NPOT, polo que " "creará texturas segmentadas ou texturas con residuos" -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Desactivar recorte por software" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" "Desactiva os intentos de Cogl de recortar algúns rectángulos por software." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Mostrar código fonte" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Mostrar o código fonte ARBfp/GLSL xerado" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Rastrexar algunhas OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Rastrexa algunhas chamadas de selección de OpenGL" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Rastrexar a compatibilidade para fóra da pantalla" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Depurar a compatibilidade para fóra da pantalla" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Desactivar as cachés dos programas" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Desactivar as cachés alternativas para programas arbfp e glsl" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Desactivar a optimización de lectura de píxel" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Desactivar a optimización de lectura de 1px para escenas simples de " "rectángulos opacos" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Rastrexar recortes" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Rexistra información sobre como Cogl está implementando o recorte" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Rastrexar problemas de rendemento" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Tenta realzar o uso non óptimo de Cogl." + +#~ msgid "Additional environment variables:" +#~ msgstr "Variábeis de ambiente adicionais:" + +#~ msgid "Comma-separated list of GL extensions to pretend are disabled" +#~ msgstr "" +#~ "Lista separada por comas de extensións de GL que se vai supoñer que están " +#~ "desactivadas" + +#~ msgid "Override the GL version that Cogl will assume the driver supports" +#~ msgstr "Anula a versión de GL que Cogl asumirá que o controlador admite" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/he.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/he.gmo differ diff -Nru cogl-1.22.0/po/he.po cogl-1.22.2/po/he.po --- cogl-1.22.0/po/he.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/he.po 2016-02-23 12:06:45.000000000 +0000 @@ -6,9 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Cogl\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=clutter\n" +"POT-Creation-Date: 2012-08-13 23:18+0300\n" "PO-Revision-Date: 2012-08-13 23:21+0200\n" "Last-Translator: Yaron Shahrabani \n" "Language-Team: Hebrew \n" @@ -21,346 +20,348 @@ "X-Poedit-Country: ISRAEL\n" "X-Poedit-SourceCharset: UTF-8\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Supported debug values:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Special debug values:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Enables all non-behavioural debug options" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "משתנים סביבתיים נוספים:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "רשימה מופרדת בפסיקים של הרחבות GL כדי להעמיד פנים שהן מנוטרלות" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "דריסת גרסת ה־GL ש־Cogl יניח שמנהל ההתקן תומך בהן" -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "Cogl debugging flags to set" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "Cogl debugging flags to unset" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "Cogl Options" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "Show Cogl options" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 +#: ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 +#: ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 +#: ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Cogl Tracing" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "CoglObject references" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Debug ref counting issues for CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Trace Texture Slicing" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "debug the creation of texture slices" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Trace Atlas Textures" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Debug texture atlas management" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Trace Blend Strings" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Debug CoglBlendString parsing" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Trace Journal" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "View all the geometry passing through the journal" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Trace Batching" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Show how geometry is being batched in the journal" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Trace matrices" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Trace all matrix manipulation" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Trace Misc Drawing" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Trace some misc drawing operations" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Trace Pango Renderer" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Trace the Cogl Pango renderer" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Trace CoglTexturePixmap backend" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Trace the Cogl texture pixmap backend" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Visualize" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Outline rectangles" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Add wire outlines for all rectangular geometry" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Show wireframes" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Add wire outlines for all geometry" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 +#: ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 +#: ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Root Cause" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Disable Journal batching" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Disable batching of geometry in the Cogl Journal." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Disable GL Vertex Buffers" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Disable use of OpenGL vertex buffer objects" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Disable GL Pixel Buffers" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Disable use of OpenGL pixel buffer objects" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Disable software rect transform" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Use the GPU to transform rectangular geometry" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Cogl Specialist" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Dump atlas images" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Dump texture atlas changes to an image file" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Disable texture atlasing" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Disable use of texture atlasing" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "Disable sharing the texture atlas between text and images" -#: cogl/cogl-debug-options.h:126 -msgid "" -"When this is set the glyph cache will always use a separate texture for its " -"atlas. Otherwise it will try to share the atlas with images." -msgstr "" -"When this is set the glyph cache will always use a separate texture for its " -"atlas. Otherwise it will try to share the atlas with images." +#: ../cogl/cogl-debug-options.h:119 +msgid "When this is set the glyph cache will always use a separate texture for its atlas. Otherwise it will try to share the atlas with images." +msgstr "When this is set the glyph cache will always use a separate texture for its atlas. Otherwise it will try to share the atlas with images." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Disable texturing" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Disable texturing any primitives" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Disable arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Disable use of ARB fragment programs" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Disable fixed" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Disable use of the fixed function pipeline backend" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Disable GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Disable use of GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Disable blending" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Disable use of blending" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Disable non-power-of-two textures" -#: cogl/cogl-debug-options.h:157 -msgid "" -"Makes Cogl think that the GL driver doesn't support NPOT textures so that it " -"will create sliced textures or textures with waste instead." -msgstr "" -"Makes Cogl think that the GL driver doesn't support NPOT textures so that it " -"will create sliced textures or textures with waste instead." +#: ../cogl/cogl-debug-options.h:150 +msgid "Makes Cogl think that the GL driver doesn't support NPOT textures so that it will create sliced textures or textures with waste instead." +msgstr "Makes Cogl think that the GL driver doesn't support NPOT textures so that it will create sliced textures or textures with waste instead." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Disable software clipping" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "Disables Cogl's attempts to clip some rectangles in software." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Show source" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Show generated ARBfp/GLSL source code" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Trace some OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Traces some select OpenGL calls" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Trace offscreen support" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Debug offscreen support" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Disable program caches" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Disable fallback caches for arbfp and glsl programs" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Disable read pixel optimization" -#: cogl/cogl-debug-options.h:188 -msgid "" -"Disable optimization for reading 1px for simple scenes of opaque rectangles" -msgstr "" -"Disable optimization for reading 1px for simple scenes of opaque rectangles" +#: ../cogl/cogl-debug-options.h:181 +msgid "Disable optimization for reading 1px for simple scenes of opaque rectangles" +msgstr "Disable optimization for reading 1px for simple scenes of opaque rectangles" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Trace clipping" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Logs information about how Cogl is implementing clipping" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Trace performance concerns" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Tries to highlight sub-optimal Cogl usage." + +#~ msgid "Cogl debugging flags to set" +#~ msgstr "Cogl debugging flags to set" + +#~ msgid "Cogl debugging flags to unset" +#~ msgstr "Cogl debugging flags to unset" + +#~ msgid "Cogl Options" +#~ msgstr "Cogl Options" + +#~ msgid "Show Cogl options" +#~ msgstr "Show Cogl options" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/hi.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/hi.gmo differ diff -Nru cogl-1.22.0/po/hi.po cogl-1.22.2/po/hi.po --- cogl-1.22.0/po/hi.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/hi.po 2016-02-23 12:06:45.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-08-01 10:44+0000\n" "PO-Revision-Date: 2012-09-19 17:46+0530\n" "Last-Translator: rajesh \n" "Language-Team: Hindi \n" @@ -20,345 +20,347 @@ "X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "समर्थित डीबग मान:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "विशेष डीबग मानों:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "सभी गैर-व्यवहारिक डिबग विकल्प सक्रीय" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "अतिरिक्त वातावरण चर:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" -msgstr "GL एक्सटेंशन का कौमा से पृथक सूची जिसे प्रीटेंड किया जाना है निष्क्रिय किया गया है" +msgstr "" +"GL एक्सटेंशन का कौमा से पृथक सूची जिसे प्रीटेंड किया जाना है निष्क्रिय किया " +"गया है" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "GL संस्करण को अधिरोहित करें जो Cogl ड्राइवर के समर्थन को लेगा" -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "Cogl डिबगिंग फ्लैग सेट किया जाना है" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "Cogl डिबगिंग फ्लैग अनसेट किया जाना है" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "Cogl विकल्प" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "Cogl विकल्प दिखाएँ" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Cogl ट्रैस कर रहा है" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "CoglObject सन्दर्भ" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "CoglObjects के लिए रेफ गणना मुद्दों डीबग करें" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "संरचना स्लाइसिंग संरचना स्लाइसिंग का पता लगायें" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "संरचना स्लाइस की रचना को डीबग करें" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "ऐटलस संरचना का पता लगायें" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "संरचना एटलस प्रबंधन को डीबग करें" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "मिश्रण लडियाँ का पता लगायें" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "CoglBlendString पारसिंग डीबग करें" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "पत्रिका का पता लगायें" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "पत्रिका के माध्यम से गुजरते ज्यामिति को देखें" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "प्रचयन का पता लगायें" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "दिखाएँ कि कैसे पत्रिका में ज्यामिति का प्रचय किया जा रहा है" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "मेट्रिसेस ट्रेस करें" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "सारे मैट्रिक्स परिवर्तन ट्रेस करें" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "विभिन्न आरेखण को ट्रेस करें" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "कुछ विभिन्न आरेखण संचालन को ट्रेस करें" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Pango Renderer को ट्रेस करें" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Cogl Pango renderer को ट्रेस करें" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Cogl बनावट पिक्समेप बैकएंड को ट्रेस करें" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Cogl बनावट पिक्समेप बैकएंड को ट्रेस करें" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "कल्पना करें" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "आयतों की रूपरेखा" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "सारे आयताकार ज्यामिति के लिए तार रूपरेखा जोड़ें" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "wireframes दिखाएँ" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "सारे ज्यामिति के लिए तार रूपरेखा जोड़ें" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "मूल कारण" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "पत्रिका प्रचयन अक्षम करें" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Cogl पत्रिका में ज्यामिति के प्रचय अक्षम करें." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "GL शीर्ष उद्धरण को अक्षम करें" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "GL शीर्ष उद्धरण ऑब्जेक्ट के प्रयोग को अक्षम करें" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "GL पिक्सेल उद्धरण अक्षम करें" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "GL पिक्सेल उद्धरण ऑब्जेक्ट के प्रयोग को अक्षम करें" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "सॉफ़्टवेयर रेक्ट बदलना अक्षम करें" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "आयताकार ज्यामिति रूपांतरण हेतु GPU का उपयोग करें" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "cogl विशेषज्ञ" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "एटलस के छवियों को डंप करें" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "एटलस के संरचना को छवि फाइल में बदल कर डंप करें" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "संरचना atlasing निष्क्रिय करें" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "संरचना atlasing के उपयोग हेतु निष्क्रिय करें" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "पाठ और छवियों के बीच एटलस की संरचना को साझा करने के लिए निष्क्रिय करें" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." msgstr "" -"जब यह सेट है कि ग्लिफ़ कैश इस एटलस के लिए हमेशा एक अलग बनावट का उपयोग करेगा. अन्यथा " +"जब यह सेट है कि ग्लिफ़ कैश इस एटलस के लिए हमेशा एक अलग बनावट का उपयोग करेगा. " +"अन्यथा " "यह छवियों के साथ एटलस को साझा करने की कोशिश करेंगे." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "टेक्सचरिंग निष्क्रिय करें" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "कोई पुरातन टेक्सचरिंग निष्क्रिय करें" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "arbfp अक्षम" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "ARB खंडित प्रोग्राम्स के उपयोग हेतु निष्क्रिय करें" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "तय निष्क्रिय करें" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "निश्चित फ़ंक्शन पाइपलाइन बैकएंड का उपयोग निष्क्रिय करें" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "GLSL अक्षम" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "GLSL का उपयोग अक्षम" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "ब्लेंडिंग अक्षम" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "ब्लेंडिंग का उपयोग अक्षम" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "दो संरचना के गैर सत्ता को अक्षम करें" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." msgstr "" -"Cogl को लगता है की GL ड्राइवर NPOT बनावट का समर्थन नहीं करता है इसीलिए यह कचरे के " +"Cogl को लगता है की GL ड्राइवर NPOT बनावट का समर्थन नहीं करता है इसीलिए यह " +"कचरे के " "साथ कटा हुआ बनावट या बनावट के बजाय पैदा करने के लिए बनाएगा." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "सॉफ़्टवेयर क्लिपिंग अक्षम" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." -msgstr "Cogl द्वारा सॉफ़्टवेयर में कुछ आयतों को क्लिप करने के प्रयास को अक्षम करता है." +msgstr "" +"Cogl द्वारा सॉफ़्टवेयर में कुछ आयतों को क्लिप करने के प्रयास को अक्षम करता है." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "स्रोत दिखाएँ" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "उत्पन्न ARBfp/GLSL स्रोत कोड दिखाएँ" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "कुछ OpenGL को ट्रेस करें" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "कुछ चयनित OpenGL कॉलस को ट्रेस करें" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "offscreen समर्थन को ट्रेस करें" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "offscreen समर्थन को डिबग करें" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "प्रोग्राम कैश अक्षम करें" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "arbfp और glsl प्रोग्राम्स के लिए प्रोग्राम कैश अक्षम करें" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "पिक्सेल अनुकूलन के पढने हेतु अक्षम करें" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" -msgstr "अपारदर्शी आयत की सरल दृश्यों के लिए 1px पढ़ने के लिए अनुकूलन को अक्षम करें" +msgstr "" +"अपारदर्शी आयत की सरल दृश्यों के लिए 1px पढ़ने के लिए अनुकूलन को अक्षम करें" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "क्लिपिंग ट्रेस करें" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Cogl क्लिपिंग को कैसे लागू कर है के बारे में जानकारी लॉग्स करें" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "ट्रेस प्रदर्शन मुद्दे" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "उप अनुकूलित Cogl प्रयोग को आलोकित करने की कोशिश करता है." + +#~ msgid "Cogl debugging flags to set" +#~ msgstr "Cogl डिबगिंग फ्लैग सेट किया जाना है" + +#~ msgid "Cogl debugging flags to unset" +#~ msgstr "Cogl डिबगिंग फ्लैग अनसेट किया जाना है" + +#~ msgid "Cogl Options" +#~ msgstr "Cogl विकल्प" + +#~ msgid "Show Cogl options" +#~ msgstr "Cogl विकल्प दिखाएँ" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/hu.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/hu.gmo differ diff -Nru cogl-1.22.0/po/hu.po cogl-1.22.2/po/hu.po --- cogl-1.22.0/po/hu.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/hu.po 2016-02-23 12:06:45.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-08-01 10:44+0000\n" "PO-Revision-Date: 2012-09-05 00:49+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -19,229 +19,213 @@ "X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Támogatott hibakeresési értékek:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Speciális hibakeresési értékek:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "" "Minden nem viselkedéssel kapcsolatos hibakeresési lehetőség engedélyezése" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "További környezeti változók:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "" "GL kiterjesztések vesszőkkel elválasztott listája, amelyek letiltása " "szimulálandó" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "" "A GL verzió felülbírálása, amelyről a Cogl feltételezi, hogy támogatott" -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "Beállítandó Cogl hibakereső jelzők" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "Törlendő Cogl hibakereső jelzők" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "Cogl beállításai" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "Cogl beállításainak megjelenítése" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Cogl követése" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "CoglObject referenciák" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Referenciaszámlálási problémák hibakeresése CoglObject-ekhez" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Textúraszeletelés követése" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "textúraszeletek létrehozásának hibakeresése" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Atlas textúrák követése" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Textúrák Atlas-kezelésének hibakeresése" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Blend karakterláncok követése" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "A CoglBlendString feldolgozás hibakeresése" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Napló követése" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "A naplón átmenő összes geometria megjelenítése" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Kötegelés követése" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "A geometria naplóban történő kötegelésének megjelenítése" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Mátrixok követése" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Minden mátrixmanipuláció követése" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Egyéb rajzolás követése" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Néhány egyéb rajzolási művelet követése" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Pango megjelenítő követése" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "A Cogl Pango megjelenítő követése" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "A CoglTexturePixmap háttérprogram követése" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "A Cogl textúrabitkép háttérprogram követése" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Vizualizáció" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Téglalapok kiemelése" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Drótkörvonalak hozzáadása minden téglalap alapú geometriához" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Drótvázak megjelenítése" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Drótvázkörvonalak hozzáadása minden geometriához" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Kiváltó ok" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Naplókötegelés letiltása" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Geometria kötegelésének letiltása a Cogl naplóban." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "GL vertexpufferek letiltása" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "OpenGL vertexpuffer objektumok használatának letiltása" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "GL pixelpufferek letiltása" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "OpenGL pixelpuffer objektumok használatának letiltása" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Szoftveres téglalap-átalakítás letiltása" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "A GPU használata a négyzet alapú geometria átalakításához" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Cogl specialista" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Atlas képek kiíratása" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Textúra Atlas változtatások kiíratása képfájlba" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Textúra Atlas letiltása" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Textúra Atlas használatának letiltása" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "A textúra Atlas megosztásának letiltása a szöveg és a képek között" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -250,51 +234,51 @@ "használ az atlasához. Ellenkező esetben megpróbálja megosztani az atlast a " "képekkel." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Textúrázás letiltása" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Primitívek textúrázásának letiltása" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Az arbfp letiltása" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "ARB töredékprogramok használatának letiltása" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Rögzített letiltása" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "A rögzített függvény-adatcsatorna háttérprogram letiltása" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "GLSL letiltása" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "A GLSL használatának letiltása" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Színátmenet letiltása" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Színátmenet használatának letiltása" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Nem kettő hatványa textúrák letiltása" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -303,69 +287,81 @@ "a nem kettő hatványa textúrákat, így szeletelt textúrákat fog készíteni, " "vagy hulladékot tartalmazó textúrákat." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Szoftveres levágás letiltása" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "Letiltja a Cogl kísérleteit néhány téglalap szoftveres vágására." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Forrás megjelenítése" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Előállított ARBfp/GLSL forráskód megjelenítése" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Néhány OpenGL követése" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Néhány kiválasztott OpenGL hívás követése" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Képernyőn kívüli támogatás követése" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Képernyőn kívüli támogatás hibaelhárítása" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Programgyorsítótárak letiltása" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Tartalék gyorsítótárak letiltása az ARBfp és GLSL programokhoz" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Olvasási pixeloptimalizáció letiltása" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "1 pixel olvasási optimalizálásának letiltása átlátszatlan téglalapok " "egyszerű jeleneteihez" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Vágás követése" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Információk naplózása a Cogl vágásmegvalósításáról" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Teljesítménygondok követése" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Az optimálisnál rosszabb Cogl használat kiszűrése" + +#~ msgid "Cogl debugging flags to set" +#~ msgstr "Beállítandó Cogl hibakereső jelzők" + +#~ msgid "Cogl debugging flags to unset" +#~ msgstr "Törlendő Cogl hibakereső jelzők" + +#~ msgid "Cogl Options" +#~ msgstr "Cogl beállításai" + +#~ msgid "Show Cogl options" +#~ msgstr "Cogl beállításainak megjelenítése" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/id.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/id.gmo differ diff -Nru cogl-1.22.0/po/id.po cogl-1.22.2/po/id.po --- cogl-1.22.0/po/id.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/id.po 2016-02-23 12:06:45.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: cogl cogl-1.12\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-09-25 23:19+0000\n" "PO-Revision-Date: 2012-09-26 08:55+0700\n" "Last-Translator: Andika Triwidada \n" "Language-Team: Indonesian \n" @@ -19,225 +19,225 @@ "X-Generator: Poedit 1.5.3\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Nilai pengawakutuan yang didukung:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Nilai pengawakutuan khusus:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Aktifkan semua opsi pengawakutuan non-perilaku" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Variabel lingkungan tambahan:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "Daftar yang dipisah koma dari ekstensi GL yang pura-pura dinonaktifkan" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "Timpa versi GL yang akan diasumsikan oleh Cogl didukung oleh penggerak" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:237 msgid "Cogl debugging flags to set" msgstr "Flag pengawakutuan Cogl yang akan ditata" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:239 msgid "Cogl debugging flags to unset" msgstr "Flag pengawakutuan Cogl yang akan dikosongkan" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:288 msgid "Cogl Options" msgstr "Opsi Cogl" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:289 msgid "Show Cogl options" msgstr "Tunjukkan opsi Cogl" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Penelusuran Cogl" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "Rerefensi CoglObject" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Acuan pengawakutuan yang mencacah masalah bagi CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Telusuri Pengirisan Tekstur" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "awakutu pembuatan irisan tekstur" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Telusuri Tekstur Atlas" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Awakutu manajemen atlas tekstur" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Telusuri Blend String" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Awakutu penguraian CoglBlendString" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Telusuri Jurnal" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Tilik semua geometri yang melintasi jurnal" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Telusuri Batch" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Tunjukkan bagaimana geometri di-batch dalam jurnal" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Telusuri matriks" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Telusuri semua manipulasi matriks" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Telusuri Menggambar Rupa-rupa" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Telusuri beberapa operasi menggambar rupa-rupa" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Telusuri Perender Pango" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Telusuri perender Pango Cogl" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Telusuri backend CoglTexturePixmap" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Telusuri backend pixmap tekstur Cogl" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Visualisasikan" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Outlinekan persegi panjang" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Tambahkan outline kawat untuk semua geometri persegi panjang" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Tunjukkan rangka kawat" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Tambahkan outline kawat untuk semua geometri" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Akar Masalah" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Nonaktifkan batch Jurnal" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Nonaktifkan batch geometri dalam Jurnal Cogl." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Nonaktifkan Penyangga Verteks GL" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Nonaktifkan penggunaan objek penyangga verteks OpenGL" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Nonaktifkan Penyangga Piksel GL" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Nonaktifkan penggunaan objek penyangga piksel OpenGL" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Nonaktifkan transformasi persegi panjang perangkat lunak" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Pakai GPU untuk mentransformasi geometri persegi panjang" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Spesialis Cogl" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Dump gambar atlas" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Dump perubahan atlas tekstur ke berkas gambar" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Nonaktifkan pengatlasan tekstur" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Nonaktifkan penggunaan pengatlasan tekstur" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "Nonaktifkan pemakaian bersama atlas tekstur antara teks dan gambar" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -245,51 +245,51 @@ "Ketika ini ditata, singgahan glyph akan selalu memakai tekstur terpisah bagi " "atlasnya. Bila tidak, itu akan mencoba berbagai atlas dengan gambar." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Nonaktifkan penteksturan" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Nonaktifkan penteksturan sebarang primitif" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Nonaktifkan arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Nonaktifkan penggunaan program fragmen ARB" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Nonaktifkan tetap" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Nonaktifkan penggunaan backend pipeline fungsi tetap" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Nonaktifkan GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Nonaktifkan pemakaian GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Nonaktifkan pencampuran" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Nonaktifkan penggunaan pencampuran (blending)" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Nonaktifkan tekstur yang bukan pangkat dari dua" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -297,73 +297,73 @@ "Buat Cogl mengira bahwa penggerak GL tak mendukung tekstur NPOT sehingga " "akan membuat tekstur diiris atau tekstur dengan limbah sebagai pengganti." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Nonaktifkan pemotongan perangkat lunak" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" "Nonaktifkan percobaan Cogl untuk memotong (clip) beberapa persegi panjang " "dalam perangkat lunak." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Tunjukkan sumber" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Tunjukkan kode sumber ARBfp/GLSL yang dibangkitkan" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Telusuri beberapa OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Telusuri beberapa pemanggilan OpenGL yang dipilih" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Telusuri dukungan luar-layar" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Awakutu dukungan luar-layar" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Nonaktifkan siggahan program" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Nonaktifkan singgahan cadangan bagi program arbfp dan glsl" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Nonaktifkan optimasi pembacaan piksel" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Nonaktifkan optimasi membaca 1px bagi skenario sederhana dari persegi " "panjang legap" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Telusuri pemotongan" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "" "Catat log informasi tentang bagaimana Cogl mengimplementasi pemotongan " "(clipping)" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Telusuri masalah kinerja" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Mencoba menyorot penggunaan Cogl yang sub-optimal." Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/it.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/it.gmo differ diff -Nru cogl-1.22.0/po/it.po cogl-1.22.2/po/it.po --- cogl-1.22.0/po/it.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/it.po 2016-08-26 16:18:04.000000000 +0000 @@ -9,236 +9,220 @@ "Project-Id-Version: cogl\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"POT-Creation-Date: 2013-04-28 14:48+0200\n" "PO-Revision-Date: 2013-04-28 19:22+0200\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" -"Language: \n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:173 msgid "Supported debug values:" msgstr "Valori di debug supportati:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:178 msgid "Special debug values:" msgstr "Valori di debug speciali:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:180 ../cogl/cogl-debug.c:182 msgid "Enables all non-behavioural debug options" msgstr "Abilita tutte le opzioni non-comportamentali di debug" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:189 msgid "Additional environment variables:" msgstr "Variabili d'ambiente aggiuntive:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:190 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "" "Elenco separato da virgole di estensioni GL da considerare disabilitate" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:192 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "Scavalca la versione di GL considerata come supportata dal driver" -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "Flag per il debug di Cogl da attivare" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "Flag per il debug di Cogl da disattivare" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "Opzioni Cogl" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "Mostra le opzioni Cogl" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Esegue il trace di Cogl" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "Riferimenti CoglObject" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Debug del conteggio riferimenti per CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Trace di texture slicing" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "Esegue il debug della creazione di porzioni di texture" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Trace delle texture atlas" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Esegue il debug della gestione dello texture atlas" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Trace di stringhe blend" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Esegue il debug dell'analisi di CoglBlendString" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Trace del journal" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Visualizza tutte le geometrie che transitano per il journal" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Trace del batching" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Mostra come la geometria viene messa in batch nel journal" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Trace delle matrici" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Esegue il trace delle manipolazioni delle matrici" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Trace di varie operazioni di disegno" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Esegue il trace di varie operazioni di disegno" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Trace di Pango Renderer" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Esegue il trace del render Pango di Cogl" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Trace del backend CoglTexturePixmap" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Esegue il trace del backend di Cogl per texture pixmap" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Visualizza" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Outline dei rettangoli" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Aggiunge outline a tutte le geometrie rettangolari" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Mostra wireframe" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Aggiunge outline a tutte le geometrie" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Causa principale" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Disabilita il batch del journal" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Disabilita il batch delle geometrie nel journal di cogl." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Disabilita GL Vertex Buffers" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Disabilita l'uso di oggetti vertex buffer OpenGL" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Disabilita GL Pixel Buffers" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Disabilita l'uso di oggetti pixel buffer OpenGL" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Disabilita le trasformazioni rettangolari software" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Utilizza la GPU per trasformare le geometrie rettangolari" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Cogl specialist" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Dump delle immagini atlas" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Esegue il dump su un file delle modifiche allo texture atlas" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Disabilita aliasing delle texture" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Disabilita l'utilizzo di aliasing delle texture" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "Disabilita la condivisione dello texture atlas tra testo e immagini" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -246,51 +230,51 @@ "Quando impostata, la cache dei glifi utilizzerà una texture separata per i " "propri atlas, altrimenti cercherà di condividerlo con le immagini." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Disabilita texture" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Disabilita il texture sulle primitive" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Disabilita arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Disabilita l'uso dei programmi ARB" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Disabilita fixed" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Disabilita l'uso della funzione fixed del backend pipeline" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Disabilita GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Disabilita l'uso di GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Disabilita blending" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Disabilita l'uso del blending" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Disabilita texture non-power-of-two" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -298,70 +282,82 @@ "Fa in modo che cogl consideri i driver GL privi di supporto per le texture " "NPOT, in modo tale da creare texture spezzettate o texture con riporti." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Disabilita il clipping software." -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" "Disabilita i tentativi di cogl di eseguire il clip di rettangoli via software" -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Mostra sorgente" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Mostra il codice sorgente generato Arbfp/GLSL" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Trace di OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Esegue il trace di alcune chiamante OpenGL" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Trace del supporto offscreen" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Debug del supporto offscreen" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Disabilita le cache del programma" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Disabilita le cache di ripiego per i programmi arbfp e glsl" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Disabilita ottimizzazione lettura pixel" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Disabilita l'ottimizzazione per la lettura di 1px per scene semplici di " "rettangoli opachi" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Trace del clipping" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Registra informazioni riguardo l'implementazione del clipping in cogl" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Esegue il trace delle prestazioni" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Cerca di evidenziare utilizzi non ottimali di Cogl." + +#~ msgid "Cogl debugging flags to set" +#~ msgstr "Flag per il debug di Cogl da attivare" + +#~ msgid "Cogl debugging flags to unset" +#~ msgstr "Flag per il debug di Cogl da disattivare" + +#~ msgid "Cogl Options" +#~ msgstr "Opzioni Cogl" + +#~ msgid "Show Cogl options" +#~ msgstr "Mostra le opzioni Cogl" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/ja.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/ja.gmo differ diff -Nru cogl-1.22.0/po/ja.po cogl-1.22.2/po/ja.po --- cogl-1.22.0/po/ja.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/ja.po 2016-08-26 16:18:04.000000000 +0000 @@ -8,362 +8,344 @@ msgid "" msgstr "" "Project-Id-Version: cogl master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-09-20 05:21+0000\n" "PO-Revision-Date: 2012-09-22 07:50+0900\n" "Last-Translator: Nishio Futoshi \n" "Language-Team: Japanese \n" -"Language: \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" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "サポートするデバッグ変数:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "特別なデバッグ変数:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "すべての非ビヘイビアのデバッグオプションを有効にします。" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "追加の環境変数:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "GL 拡張にみえるが利用不可能なものをカンマで分離したリスト" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" -msgstr "" -"ドライバーがサポートしていると Cogl が仮定する GL のバージョンをオーバーライ" -"ドする" +msgstr "ドライバーがサポートしていると Cogl が仮定する GL のバージョンをオーバーライドする" -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "Cogl のデバッグフラグを指定する" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "Cogl のデバッグフラグを解除する" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "Cogl のオプション" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "Cogl のオプションを表示する" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Cogl のトレーシング" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "CoglObject の参照" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "CoglObjects の参照カウントの問題をデバッグします。" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "テクスチャースライシングのトレース" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "テクスチャースライスの作成をデバッグします。" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "アトラステクスチャーのトレース" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "アトラステクスチャーの管理をデバッグします。" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "文字のブレンドのトレース" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "CoglBlendString の解析をデバッグします。" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "ジャーナルのトレース" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "ジャーナルを通過するすべてのジオメトリーを表示します。" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "バッチ処理のトレース" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "ジオメトリーがジャーナルにバッチ処理されている状況を表示します。" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "行列のトレース" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "すべての行列操作をトレースします。" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "その他の描画のトレース" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "その他の雑多な描画操作をトレースします。" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Pango レンダラーのトレース" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Cogl の Pango レンダラーをトレースします。" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Cogl テクスチャーピクセルマップのバックエンドのトレース" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Cogl テクスチャーピクセルマップのバックエンドをトレースします。" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "可視化" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "アウトラインの矩形" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "すべての矩形のジオメトリーのワイアーアウトラインを追加します。" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "ワイアーフレームの表示" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "すべてのジオメトリーのワイアーのアウトラインを追加します。" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "根本的原因" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "ジャーナルバッチ処理の無効化" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Cogl のジャーナル内のジオメトリーのバッチ処理を無効にします。" -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "GL 頂点バッファーの無効化" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "OpenGL 頂点バッファーオブジェクトの使用を無効化します。" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "GL ピクセルバッファーの無効化" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "OpenGL ピクセルバッファーオブジェクトの使用を無効化します。" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "ソフトウェアによる矩形変換の無効化" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "矩形のジオメトリーを変換するために GPU を使用します。" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Cogl スペシャリスト" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "テクスチャーアトラスのダンプ" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "テクスチャーアトラスを１つの画像ファイルにダンプします。" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "テクスチャーアトラシングの無効化" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "テクスチャーアトラシングの使用を無効化します。" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "文字と画像の間のテクスチャーアトラスの共有を無効化します。" -#: cogl/cogl-debug-options.h:126 -msgid "" -"When this is set the glyph cache will always use a separate texture for its " -"atlas. Otherwise it will try to share the atlas with images." -msgstr "" -"この設定が有効な場合、グリフのキャッシュは、常にそのアトラスのために別のテク" -"スチャーを使用します。それ以外の場合は、画像とアトラスを共有しようとします。" +#: ../cogl/cogl-debug-options.h:119 +msgid "When this is set the glyph cache will always use a separate texture for its atlas. Otherwise it will try to share the atlas with images." +msgstr "この設定が有効な場合、グリフのキャッシュは、常にそのアトラスのために別のテクスチャーを使用します。それ以外の場合は、画像とアトラスを共有しようとします。" -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "テクスチャーの無効化" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "テクスチャーと任意のプリミティブを無効にします。" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "ARBfp の無効化" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "ARB フラグメントプログラムの使用を無効化します。" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "固定機能パイプラインの無効化" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "固定機能パイプラインのバックエンドの使用を無効化します。" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "GLSL の無効化" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "GLSL の使用を無効化します。" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "ブレンディングの無効化" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "ブレンディングの使用を無効化します。" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "2の累乗以外のサイズのテクスチャーの無効化" -#: cogl/cogl-debug-options.h:157 -msgid "" -"Makes Cogl think that the GL driver doesn't support NPOT textures so that it " -"will create sliced textures or textures with waste instead." -msgstr "" -"Cogl はスライスされたテクスチャーや代わりに無駄な部分を持つテクスチャーを作成" -"されるように、GL ドライバーが NPOT テクスチャーをサポートしていないことを考慮" -"しなければなりません。" +#: ../cogl/cogl-debug-options.h:150 +msgid "Makes Cogl think that the GL driver doesn't support NPOT textures so that it will create sliced textures or textures with waste instead." +msgstr "Cogl はスライスされたテクスチャーや代わりに無駄な部分を持つテクスチャーを作成されるように、GL ドライバーが NPOT テクスチャーをサポートしていないことを考慮しなければなりません。" -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "ソフトウェアクリッピングの無効化" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "一部の矩形をソフトウェアにてクリップする Cogl の試みを無効化します。" -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "ソースコードの表示" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "ARBfp/GLSL のソースコードを生成して表示します。" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "いくつかの OpenGL のトレース" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "いくつか選択した OpenGL の呼び出しをトレースします。" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "オフスクリーンサポートのトレース" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "オフスクリーンサポートをデバッグします。" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "プログラムキャッシュの無効化" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "ARBfp と GLSL プログラムに対する代替キャッシュの適用を無効化します。" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "ピクセルの最適化の読み込みの無効化" -#: cogl/cogl-debug-options.h:188 -msgid "" -"Disable optimization for reading 1px for simple scenes of opaque rectangles" -msgstr "" -"不透明な矩形のシンプルなシーンのために1ピクセル読み込む最適化を無効化します。" +#: ../cogl/cogl-debug-options.h:181 +msgid "Disable optimization for reading 1px for simple scenes of opaque rectangles" +msgstr "不透明な矩形のシンプルなシーンのために1ピクセル読み込む最適化を無効化します。" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "クリッピングのトレース" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Cogl に実装されているクリッピング機能のログ情報を記録します。" # ROIとは違うのかな？ -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "トレース実行の関心領域" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Cogl の使用時の最適下限の強調表示を試みる" + +#~ msgid "Cogl debugging flags to set" +#~ msgstr "Cogl のデバッグフラグを指定する" + +#~ msgid "Cogl debugging flags to unset" +#~ msgstr "Cogl のデバッグフラグを解除する" + +#~ msgid "Cogl Options" +#~ msgstr "Cogl のオプション" + +#~ msgid "Show Cogl options" +#~ msgstr "Cogl のオプションを表示する" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/km.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/km.gmo differ diff -Nru cogl-1.22.0/po/km.po cogl-1.22.2/po/km.po --- cogl-1.22.0/po/km.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/km.po 2016-08-26 16:18:04.000000000 +0000 @@ -6,13 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: cogl.master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-01-09 19:05+0000\n" "PO-Revision-Date: 2012-01-24 11:14+0700\n" "Last-Translator: Seng Sutha \n" "Language-Team: Khmer \n" -"Language: \n" +"Language: km\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,349 +19,334 @@ "X-Generator: WordForge 0.8 RC1\n" "X-Language: km-KH\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:172 msgid "Supported debug values:" msgstr "បំបាត់​កំហុស​តម្លៃ​ដែល​បាន​គាំទ្រ ៖" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:177 msgid "Special debug values:" msgstr "បំបាត់​កំហុស​តម្លៃ​ពិសេស ៖" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:179 ../cogl/cogl-debug.c:181 msgid "Enables all non-behavioural debug options" msgstr "បើក​​គ្រប់​ជម្រើស​បំបាត់​កំហុស​​​នៃ​ឥរិយា​ដែល​គ្មាន​ទាំងអស់" -#: cogl/cogl-debug.c:197 -msgid "Additional environment variables:" -msgstr "" - -#: cogl/cogl-debug.c:198 -msgid "Comma-separated list of GL extensions to pretend are disabled" -msgstr "" - -#: cogl/cogl-debug.c:200 -msgid "Override the GL version that Cogl will assume the driver supports" -msgstr "" - -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:225 msgid "Cogl debugging flags to set" msgstr "ទង់​ជាតិ​បំបាត់​កំហុស​​ Cogl ត្រូវ​កំណត់" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:227 msgid "Cogl debugging flags to unset" msgstr "ទង់ជាតិ​បំបាត់​កំហុស​មិន​ត្រូវ​កំណត់" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:276 msgid "Cogl Options" msgstr "ជម្រើស​របស់ Cogl" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:277 msgid "Show Cogl options" msgstr "បង្ហាញ​ជម្រើស​របស់ Cogl" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 msgid "Cogl Tracing" msgstr "ការ​តាមដាន​​នៃ Cogl" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "សេចក្ដី​យោង​របស់ CoglObject" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "បំបាត់​កំហុស​បញ្ហា​អំពី​ការ​រាប់​​​សេចក្ដី​យោង​សម្រាប់ CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 #, fuzzy msgid "Trace Texture Slicing" msgstr "ដាន​ក្នុង​ការ​កាត់​ជា​បន្ទះ​នៃ​​វាយនភាព" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "បំបាត់​កំហុស​ក្នុង​ការ​​កាត់​ជា​បន្ទះ​នៃ​វាយនភាព" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "ដាន​វាយនភាព​សៀវភៅ​ផែនទី​" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 #, fuzzy msgid "Debug texture atlas management" msgstr "បំបាត់​កំហុស​ការ​គ្រប់គ្រង​សៀវភៅ​ផែនទី​​​នៃ​វាយនភាព" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "ដាន​ល្បាយ​ខ្សែ​អក្សរ" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "កំហុស​ក្នុង​ការ​ញែក CoglBlendString" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "ដាន​ទិនានុប្បវត្តិ​" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "មើល​គ្រប់​ការ​​ហុច​ធរណីមាត្រ​ទាំងអស់​តាម​ទិនានុប្បវត្តិ" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "ការ​ដាក់​ដាន​ជា​ក្រុម" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "បង្ហាញ​របៀប​ធរណីមាត្រ​ត្រូវ​បាន​ដាក់​ចំនួយ​ច្រើន​ក្នុង​ទិនានុប្បវត្តិ" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "ដាន​ម៉ាទ្រីស" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "ដាន​គ្រប់​ការ​ធ្វើ​ម៉ាទ្រីស​ទាំងអស់" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "ដាន​គំនូរ​ផ្សេងៗ" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "ដាន​ក្នុង​ការ​ប្រតិបត្តិ​ការ​គំនូរ​ផ្សេង​មួយ​ចំនួន" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "ដាន​កម្មវិធី​បង្ហាញ Pango" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "ដាន​កម្មវិធី​បង្ហាញ Cogl Pango" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "ដាន​កម្មវិធី​ខាងក្រោយ CoglTexturePixmap" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "ដាន​កម្មវិធី​ខាងក្រោយ Cogl texture pixmap" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "ធ្វើ​ឲ្យ​មើល​ឃើញ" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "ចតុកោណ​របស់​​គ្រោង" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "បន្ថែម​គ្រោង​ខ្សែ​សម្រាប់​ធរណីមាត្រ​ដែល​​​ជា​ចតុកោណ​ទាំងអស់" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "បង្ហាញ wireframes" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "បន្ថែម​​គ្រោង​ខ្សែ​សម្រាប់​ធរណីមាត្រ​ទាំងអស់" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "មូលហេតុ Root" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "បិទ​ការ​ដាក់​​​​ទិនានុប្បវត្តិ​ជា​ក្រុម" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "បិទ​ការ​ដាក់​ធរណីមាត្រ​ជា​ក្រុម​នៅ​ក្នុង​ទិនានុប្បវត្តិ​របស់ Cogl ។" -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "បិទ​អង្គ​ចងចាំ​បណ្ដោះ​អាសន្ន​ផ្នែក​ខាងលើ​​របស់ GL" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" -msgstr "បិទ​ការ​ប្រើប្រាស់​នៃ​​វត្ថុ​​​អង្គ​​​ចងចាំ​បណ្ដោះអាសន្ន​ផ្នែក​ខាងលើ​របស់ OpenGL" +msgstr "" +"បិទ​ការ​ប្រើប្រាស់​នៃ​​វត្ថុ​​​អង្គ​​​ចងចាំ​បណ្ដោះអាសន្ន​ផ្នែក​ខាងលើ​របស់ " +"OpenGL" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "បិទ​អង្គ​ចងចាំ​បណ្ដោះអាសន្ន​ភីកសែល​របស់ GL" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "បិទ​ការ​ប្រើប្រាស់​វត្ថុ​អង្គ​ចងចាំ​បណ្ដោះអាសន្ន​​ភីកសែល​របស់ OpenGL" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "បិទ​​ការ​ប្លែង​ដែល​​ជា​ចតុកោណ​​​របស់​​កម្មវិធី ។" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "ប្រើ GPU ដើម្បី​ប្លែង​ធរណីមាត្រ​ដែល​​ជា​ចតុកោណ" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "អ្នក​ឯកទេស Cogl" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "បោះបង់​រូបភាព​នៃ​សៀវភៅ​ផែន​ទី" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "បោះបង់​ការ​ផ្លាស់ប្ដូរ​សៀវភៅ​ផែនទី​​វាយនភាព​ទៅកាន់​ឯកសារ​រូបភាព" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "បិទ​​ការ​ដាក់​​សៀវភៅ​ផែនទី​នៃ​វាយនភាព" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "បិទ​ការ​ប្រើប្រាស់​នៃ​​ការ​ដាក់​សៀវភៅ​ផែន​ទី​នៃ​វាយនភាព" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "បិទ​ការ​ចែករំលែក​​សៀវភៅ​ផែនទី​នៃ​វាយនភាព​រវាង​អត្ថបទ និង​រូបភាព" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 #, fuzzy msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." msgstr "" -"នៅ​ពេល​វា​ត្រូវ​បាន​កំណត់​ឃ្លាំង​សម្ងាត់​របស់ glyph នឹង​ប្រើ​វាយនភាព​​បំបែក​សម្រាប់​សៀវភៅ​ផែនទី​ជានិច្ច ។ " -"ម្យ៉ាងទៀត វា​នឹង​ចែករំលែក​សៀវភៅ​ផែន​ទី​​ជាមួយ​រូបភាព ។" +"នៅ​ពេល​វា​ត្រូវ​បាន​កំណត់​ឃ្លាំង​សម្ងាត់​របស់ glyph " +"នឹង​ប្រើ​វាយនភាព​​បំបែក​សម្រាប់​សៀវភៅ​ផែនទី​ជានិច្ច ។ ម្យ៉ាងទៀត " +"វា​នឹង​ចែករំលែក​សៀវភៅ​ផែន​ទី​​ជាមួយ​រូបភាព ។" -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "បិទ​ការ​ធ្វើ​វាយនភាព" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "បិទ​ការ​ធ្វើ​វាយនភាព​​ជា​ដំបូង​មួយ​ចំនួន" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "បិទ arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "បិទ​ការ​ប្រើប្រាស់​កម្មវិធី​បំណែក​របស់ ARB" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "បិទ​ថេរ" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 #, fuzzy msgid "Disable use of the fixed function pipeline backend" msgstr "បិទ​ការ​ប្រើ​ប្រាស់​កម្មវិធី​ខាងក្រោយ pipeline នៃ​មុខងារ​ថេរ" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "បិទ GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "បិទ​ការ​ប្រើប្រាស់​នៃ GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "បិទ​ការ​លាយ" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "បិទ​ការ​ប្រើប្រាស់​នៃ​ការ​លាយ" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "បិទ​វាយនភាព​ពីរ​ដែល​គ្មាន​ថាមពល" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." msgstr "" -"ការ​ធ្វើ​ឲ្យ Cogl ស្គាល់​ថា​កម្មវិធី​បញ្ជា​របស់ GL មិន​គាំទ្រ​វាយនភាព​របស់ NPOT ទេ ដូច្នោះ​វា​នឹង​បង្កើត​" -"វាយនភាព​ដែល​​បាន​ចែក​ជា​ផ្នែក ឬ​វាយនភាព​ដែល​មាន​ភាព​ខ្ជះខ្ជាយ​ ។" +"ការ​ធ្វើ​ឲ្យ Cogl ស្គាល់​ថា​កម្មវិធី​បញ្ជា​របស់ GL មិន​គាំទ្រ​វាយនភាព​របស់ " +"NPOT ទេ ដូច្នោះ​វា​នឹង​បង្កើត​វាយនភាព​ដែល​​បាន​ចែក​ជា​ផ្នែក " +"ឬ​វាយនភាព​ដែល​មាន​ភាព​ខ្ជះខ្ជាយ​ ។" -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "បិទ​ការ​កាត់​​កម្មវិធី" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." -msgstr "បិទ​ការ​ប៉ុនប៉ង​របស់ Cogl ដើម្បី​កាត់​ចតុកោណ​មួយ​ចំនួន​នៅ​ក្នុង​កម្មវិធី ។" +msgstr "" +"បិទ​ការ​ប៉ុនប៉ង​របស់ Cogl ដើម្បី​កាត់​ចតុកោណ​មួយ​ចំនួន​នៅ​ក្នុង​កម្មវិធី ។" -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "បង្ហាញ​ប្រភព" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "បង្ហាញ​កូដ​ប្រភព​របស់ ARBfp/GLSL ដែល​បាន​បង្កើត" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "ដាន OpenGL មួយ​ចំនួន" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "ដាន​ជ្រើស​ការ​ហៅ OpenGL មួយ​ចំនួន" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "ការ​គាំទ្រ offscreen ​ដាន" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "បំបាត់​កំហុស​ការ​គាំទ្រ offscreen" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "បិទ​ឃ្លាំង​សម្ងាត់​របស់​កម្មវិធី" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "បិទ​ឃ្លាំង​សម្ងាត់​របស់ fallback សម្រាប់​កម្មវិធី arbfp និង glsl" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "បិទ​ការ​អាន​ការ​ធ្វើ​ឲ្យ​ភីសែល​ល្អប្រសើរ" -#: cogl/cogl-debug-options.h:188 -msgid "" -"Disable optimization for reading 1px for simple scenes of opaque rectangles" -msgstr "បិទ​ការ​ធ្វើ​ឲ្យ​ល្អ​​ប្រសើរ​ក្នុង​ការ​អាន ១ ភីសែល រូបភាព​សាមញ្ញ​នៃ​​ចតុកោណ​ស្រអាប់" +#: ../cogl/cogl-debug-options.h:181 +msgid "Disable optimization for reading 1px for simple scenes of opaque rectangles" +msgstr "" +"បិទ​ការ​ធ្វើ​ឲ្យ​ល្អ​​ប្រសើរ​ក្នុង​ការ​អាន ១ ភីសែល " +"រូបភាព​សាមញ្ញ​នៃ​​ចតុកោណ​ស្រអាប់" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "ការ​កាត់​ដាន" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "ព័ត៌មាន​​កំណត់​ហេតុ​អំពី​របៀប​ Cogl ប្រតិបត្តិ​ការ​កាត់" - -#: cogl/cogl-debug-options.h:198 -msgid "Trace performance concerns" -msgstr "" - -#: cogl/cogl-debug-options.h:199 -msgid "Tries to highlight sub-optimal Cogl usage." -msgstr "" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/kn.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/kn.gmo differ diff -Nru cogl-1.22.0/po/kn.po cogl-1.22.2/po/kn.po --- cogl-1.22.0/po/kn.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/kn.po 2016-02-23 12:06:45.000000000 +0000 @@ -8,7 +8,7 @@ "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"POT-Creation-Date: 2012-03-05 23:14+0000\n" "PO-Revision-Date: 2011-09-05 13:03+0530\n" "Last-Translator: Shankar Prasad \n" "Language-Team: Kannada \n" @@ -19,341 +19,320 @@ "X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: cogl/cogl-debug.c:181 +#: cogl/cogl-debug.c:172 msgid "Supported debug values:" msgstr "" -#: cogl/cogl-debug.c:186 +#: cogl/cogl-debug.c:177 msgid "Special debug values:" msgstr "" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: cogl/cogl-debug.c:179 cogl/cogl-debug.c:181 msgid "Enables all non-behavioural debug options" msgstr "" -#: cogl/cogl-debug.c:197 -msgid "Additional environment variables:" -msgstr "" - -#: cogl/cogl-debug.c:198 -msgid "Comma-separated list of GL extensions to pretend are disabled" -msgstr "" - -#: cogl/cogl-debug.c:200 -msgid "Override the GL version that Cogl will assume the driver supports" -msgstr "" - -#: cogl/cogl-debug.c:244 +#: cogl/cogl-debug.c:225 msgid "Cogl debugging flags to set" msgstr "ಹೊಂದಿಸಬೇಕಿರುವ Cogl ದೋಷ ನಿವಾರಣಾ ಗುರುತುಗಳು" -#: cogl/cogl-debug.c:246 +#: cogl/cogl-debug.c:227 msgid "Cogl debugging flags to unset" msgstr "ರದ್ದುಗೊಳಿಸಲಾದ Cogl ದೋಷ ನಿವಾರಣಾ ಗುರುತುಗಳು" -#: cogl/cogl-debug.c:295 +#: cogl/cogl-debug.c:276 msgid "Cogl Options" msgstr "Cogl ಆಯ್ಕೆಗಳು" -#: cogl/cogl-debug.c:296 +#: cogl/cogl-debug.c:277 msgid "Show Cogl options" msgstr "Cogl ಆಯ್ಕೆಗಳನ್ನು ತೋರಿಸು" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: cogl/cogl-debug-options.h:25 cogl/cogl-debug-options.h:30 +#: cogl/cogl-debug-options.h:35 cogl/cogl-debug-options.h:40 +#: cogl/cogl-debug-options.h:45 cogl/cogl-debug-options.h:50 +#: cogl/cogl-debug-options.h:55 cogl/cogl-debug-options.h:61 +#: cogl/cogl-debug-options.h:66 cogl/cogl-debug-options.h:71 +#: cogl/cogl-debug-options.h:158 cogl/cogl-debug-options.h:163 +#: cogl/cogl-debug-options.h:168 cogl/cogl-debug-options.h:184 msgid "Cogl Tracing" msgstr "" -#: cogl/cogl-debug-options.h:34 +#: cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "" -#: cogl/cogl-debug-options.h:35 +#: cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "" -#: cogl/cogl-debug-options.h:39 +#: cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "" -#: cogl/cogl-debug-options.h:40 +#: cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "" -#: cogl/cogl-debug-options.h:44 +#: cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "" -#: cogl/cogl-debug-options.h:45 +#: cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "" -#: cogl/cogl-debug-options.h:49 +#: cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "" -#: cogl/cogl-debug-options.h:50 +#: cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "" -#: cogl/cogl-debug-options.h:54 +#: cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "" -#: cogl/cogl-debug-options.h:55 +#: cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "" -#: cogl/cogl-debug-options.h:59 +#: cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "" -#: cogl/cogl-debug-options.h:60 +#: cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "" -#: cogl/cogl-debug-options.h:64 +#: cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "" -#: cogl/cogl-debug-options.h:65 +#: cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "" -#: cogl/cogl-debug-options.h:70 +#: cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "" -#: cogl/cogl-debug-options.h:71 +#: cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "" -#: cogl/cogl-debug-options.h:75 +#: cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "" -#: cogl/cogl-debug-options.h:76 +#: cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "" -#: cogl/cogl-debug-options.h:80 +#: cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:81 +#: cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: cogl/cogl-debug-options.h:76 cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "" -#: cogl/cogl-debug-options.h:85 +#: cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "" -#: cogl/cogl-debug-options.h:86 +#: cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:90 +#: cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "" -#: cogl/cogl-debug-options.h:91 +#: cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: cogl/cogl-debug-options.h:86 cogl/cogl-debug-options.h:91 +#: cogl/cogl-debug-options.h:96 cogl/cogl-debug-options.h:101 +#: cogl/cogl-debug-options.h:111 cogl/cogl-debug-options.h:116 +#: cogl/cogl-debug-options.h:122 cogl/cogl-debug-options.h:127 +#: cogl/cogl-debug-options.h:132 cogl/cogl-debug-options.h:137 +#: cogl/cogl-debug-options.h:142 cogl/cogl-debug-options.h:147 +#: cogl/cogl-debug-options.h:153 cogl/cogl-debug-options.h:173 +#: cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "" -#: cogl/cogl-debug-options.h:95 +#: cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "" -#: cogl/cogl-debug-options.h:96 +#: cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "" -#: cogl/cogl-debug-options.h:100 +#: cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "" -#: cogl/cogl-debug-options.h:101 +#: cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:105 +#: cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "" -#: cogl/cogl-debug-options.h:106 +#: cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:110 +#: cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "" -#: cogl/cogl-debug-options.h:111 +#: cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:113 +#: cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "" -#: cogl/cogl-debug-options.h:115 +#: cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "" -#: cogl/cogl-debug-options.h:116 +#: cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "" -#: cogl/cogl-debug-options.h:120 +#: cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:121 +#: cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:125 +#: cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "" -#: cogl/cogl-debug-options.h:126 +#: cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." msgstr "" -#: cogl/cogl-debug-options.h:131 +#: cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "" -#: cogl/cogl-debug-options.h:132 +#: cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "" -#: cogl/cogl-debug-options.h:136 +#: cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "" -#: cogl/cogl-debug-options.h:137 +#: cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "" -#: cogl/cogl-debug-options.h:141 +#: cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "" -#: cogl/cogl-debug-options.h:142 +#: cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "" -#: cogl/cogl-debug-options.h:146 +#: cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "" -#: cogl/cogl-debug-options.h:147 +#: cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "" -#: cogl/cogl-debug-options.h:151 +#: cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "" -#: cogl/cogl-debug-options.h:152 +#: cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "" -#: cogl/cogl-debug-options.h:156 +#: cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "" -#: cogl/cogl-debug-options.h:157 +#: cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." msgstr "" -#: cogl/cogl-debug-options.h:162 +#: cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "" -#: cogl/cogl-debug-options.h:163 +#: cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" -#: cogl/cogl-debug-options.h:167 +#: cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "" -#: cogl/cogl-debug-options.h:168 +#: cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "" -#: cogl/cogl-debug-options.h:172 +#: cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "" -#: cogl/cogl-debug-options.h:173 +#: cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "" -#: cogl/cogl-debug-options.h:177 +#: cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:178 +#: cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:182 +#: cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "" -#: cogl/cogl-debug-options.h:183 +#: cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "" -#: cogl/cogl-debug-options.h:187 +#: cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "" -#: cogl/cogl-debug-options.h:188 +#: cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" -#: cogl/cogl-debug-options.h:193 +#: cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "" -#: cogl/cogl-debug-options.h:194 +#: cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "" - -#: cogl/cogl-debug-options.h:198 -msgid "Trace performance concerns" -msgstr "" - -#: cogl/cogl-debug-options.h:199 -msgid "Tries to highlight sub-optimal Cogl usage." -msgstr "" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/ko.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/ko.gmo differ diff -Nru cogl-1.22.0/po/ko.po cogl-1.22.2/po/ko.po --- cogl-1.22.0/po/ko.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/ko.po 2016-02-23 12:06:45.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2014-09-11 03:06+0000\n" "PO-Revision-Date: 2014-09-11 19:55+0900\n" "Last-Translator: Seong-ho Cho \n" "Language-Team: Korean \n" @@ -20,225 +20,225 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 1.5.4\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:181 msgid "Supported debug values:" msgstr "지원 디버깅 값:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:186 msgid "Special debug values:" msgstr "특수 디버깅 값:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:188 ../cogl/cogl-debug.c:190 msgid "Enables all non-behavioural debug options" msgstr "동작과 무관한 모든 디버깅 옵션 활성화" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:197 msgid "Additional environment variables:" msgstr "추가 환경 변수:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:198 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "비활성화할 GL 확장의 쉼표 구분 목록" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:200 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "코글에서 드라이버를 지원한다고 간주하는 GL 버전을 재적용" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:244 msgid "Cogl debugging flags to set" msgstr "코글 디버깅 플래그를 설정으로 표시" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:246 msgid "Cogl debugging flags to unset" msgstr "코글 디버깅 플래그를 설정 안함으로 표시" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:295 msgid "Cogl Options" msgstr "코글 옵션" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:296 msgid "Show Cogl options" msgstr "코글 옵션 표시" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:32 ../cogl/cogl-debug-options.h:37 +#: ../cogl/cogl-debug-options.h:42 ../cogl/cogl-debug-options.h:47 +#: ../cogl/cogl-debug-options.h:52 ../cogl/cogl-debug-options.h:57 +#: ../cogl/cogl-debug-options.h:62 ../cogl/cogl-debug-options.h:68 +#: ../cogl/cogl-debug-options.h:73 ../cogl/cogl-debug-options.h:78 +#: ../cogl/cogl-debug-options.h:165 ../cogl/cogl-debug-options.h:170 +#: ../cogl/cogl-debug-options.h:175 ../cogl/cogl-debug-options.h:191 +#: ../cogl/cogl-debug-options.h:196 msgid "Cogl Tracing" msgstr "코글 추적" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:34 msgid "CoglObject references" msgstr "CoglObject 참조" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:35 msgid "Debug ref counting issues for CoglObjects" msgstr "CoglObject의 참조 카운팅 이슈 디버깅" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:39 msgid "Trace Texture Slicing" msgstr "텍스처 슬라이싱 추적" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:40 msgid "debug the creation of texture slices" msgstr "텍스처 슬라이스 생성 디버깅" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:44 msgid "Trace Atlas Textures" msgstr "아틀라스 텍스처 추적" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:45 msgid "Debug texture atlas management" msgstr "텍스처 아틀라스 관리 디버깅" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:49 msgid "Trace Blend Strings" msgstr "블렌드 문자열 추적" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:50 msgid "Debug CoglBlendString parsing" msgstr "CoglBlendString 해석 디버깅" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:54 msgid "Trace Journal" msgstr "저널 추적" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:55 msgid "View all the geometry passing through the journal" msgstr "저널을 거쳐가는 모든 영역 보기" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:59 msgid "Trace Batching" msgstr "일괄 처리 추적" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:60 msgid "Show how geometry is being batched in the journal" msgstr "저널에서 영역을 어떻게 일괄 처리하는지 표시" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace matrices" msgstr "매트리스 추적" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:65 msgid "Trace all matrix manipulation" msgstr "모든 행렬 연산 추적" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:70 msgid "Trace Misc Drawing" msgstr "기타 그리기 동작 추적" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:71 msgid "Trace some misc drawing operations" msgstr "일부 기타 그리기 처리 동작 추적" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:75 msgid "Trace Pango Renderer" msgstr "판고 렌더러 추적" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:76 msgid "Trace the Cogl Pango renderer" msgstr "코글 판고 렌더러 추적" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:80 msgid "Trace CoglTexturePixmap backend" msgstr "CoglTexturePixmap 백엔드 추적" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:81 msgid "Trace the Cogl texture pixmap backend" msgstr "Cogl texture pixmap 백엔드 추적" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:83 ../cogl/cogl-debug-options.h:88 msgid "Visualize" msgstr "시각화" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:85 msgid "Outline rectangles" msgstr "사각 영역 외곽선 표시" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:86 msgid "Add wire outlines for all rectangular geometry" msgstr "모든 사각 영역의 외곽선 틀 추가" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:90 msgid "Show wireframes" msgstr "틀 표시" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:91 msgid "Add wire outlines for all geometry" msgstr "모든 영역의 외곽선 틀 추가" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:93 ../cogl/cogl-debug-options.h:98 +#: ../cogl/cogl-debug-options.h:103 ../cogl/cogl-debug-options.h:108 +#: ../cogl/cogl-debug-options.h:118 ../cogl/cogl-debug-options.h:123 +#: ../cogl/cogl-debug-options.h:129 ../cogl/cogl-debug-options.h:134 +#: ../cogl/cogl-debug-options.h:139 ../cogl/cogl-debug-options.h:144 +#: ../cogl/cogl-debug-options.h:149 ../cogl/cogl-debug-options.h:154 +#: ../cogl/cogl-debug-options.h:160 ../cogl/cogl-debug-options.h:180 +#: ../cogl/cogl-debug-options.h:185 msgid "Root Cause" msgstr "근본 원인" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:95 msgid "Disable Journal batching" msgstr "저널 일괄 처리 비활성화" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:96 msgid "Disable batching of geometry in the Cogl Journal." msgstr "코글 저널의 영역 일괄 처리 비활성화." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:100 msgid "Disable GL Vertex Buffers" msgstr "GL 정점 버퍼 비활성화" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:101 msgid "Disable use of OpenGL vertex buffer objects" msgstr "OpenGL 정점 버퍼 객체 사용 비활성화" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:105 msgid "Disable GL Pixel Buffers" msgstr "GL 픽셀 버퍼 비활성화" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:106 msgid "Disable use of OpenGL pixel buffer objects" msgstr "OpenGL픽셀 버퍼 비활성화" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:110 msgid "Disable software rect transform" msgstr "소프트웨어 rect 변환 비활성화" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:111 msgid "Use the GPU to transform rectangular geometry" msgstr "사각 영역 변환에 GPU 사용" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:113 msgid "Cogl Specialist" msgstr "코글 전문가" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:115 msgid "Dump atlas images" msgstr "아틀라스 이미지 덤프 기록" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:116 msgid "Dump texture atlas changes to an image file" msgstr "이미지 파일의 내용을 바꾸는 텍스처 아틀라스 덤프를 기록" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:120 msgid "Disable texture atlasing" msgstr "텍스처 아틀라싱 비활성화" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:121 msgid "Disable use of texture atlasing" msgstr "텍스처 아틀라싱 사용 비활성화" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable sharing the texture atlas between text and images" msgstr "텍스트 및 이미지간의 텍스처 아틀라스 공유 비활성화" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:126 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -246,51 +246,51 @@ "이 항목을 설정하면 글리프 캐시는 항상 글리프 캐시 아틀라스에 분할 텍스처를 사" "용합니다. 설정하지 않으면 이미지가 들어간 아틀라스의 공유를 시도합니다." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:131 msgid "Disable texturing" msgstr "텍스처 처리 비활성화" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:132 msgid "Disable texturing any primitives" msgstr "어떤 프리미티브에 대해서든 텍스처 처리 비활성화" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:136 msgid "Disable arbfp" msgstr "ARBfp 비활성화" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:137 msgid "Disable use of ARB fragment programs" msgstr "ARB 단편화 프로그램 사용 비활성화" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:141 msgid "Disable fixed" msgstr "고정 비활성화" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:142 msgid "Disable use of the fixed function pipeline backend" msgstr "고정 함수 파이프라인 백엔드 사용 비활성화" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:146 msgid "Disable GLSL" msgstr "GLSL 비활성화" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:147 msgid "Disable use of GLSL" msgstr "GLSL 사용 비활성화" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:151 msgid "Disable blending" msgstr "블렌딩 비활성화" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:152 msgid "Disable use of blending" msgstr "블렌딩 사용 비활성화" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:156 msgid "Disable non-power-of-two textures" msgstr "2의 비거듭제곱 텍스처 비활성화" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:157 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -298,69 +298,69 @@ "코글에서 GL 드라이버가 NPOT 텍스처를 지원하지 않는 것으로 간주하게끔 하여 슬" "라이싱한 텍스처를 만들거나 불필요한 텍스처를 만듬." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:162 msgid "Disable software clipping" msgstr "소프트웨어 클리핑 비활성화" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:163 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" "코글이 소프트웨어 처리 방식으로 일부 사각 영역을 클리핑 하려는 시도를 비활성" "화." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:167 msgid "Show source" msgstr "원본 표시" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:168 msgid "Show generated ARBfp/GLSL source code" msgstr "생성한 ARBfp/GLSL 소스 코드 표시" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:172 msgid "Trace some OpenGL" msgstr "일부 OpenGL 추적" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:173 msgid "Traces some select OpenGL calls" msgstr "일부 OpenGL 호출을 선택하여 추적" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:177 msgid "Trace offscreen support" msgstr "오프스크린 지원 추적" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:178 msgid "Debug offscreen support" msgstr "오프스크린 지원 디버깅" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:182 msgid "Disable program caches" msgstr "프로그램 캐시 비활성화" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:183 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "ARBfp 및 GLSL 프로그램의 대체 캐시 비활성화" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:187 msgid "Disable read pixel optimization" msgstr "읽기 픽셀 최적화 비활성화" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:188 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "불투명 사각 객체가 있는 단순 장면에서 1픽셀을 읽을 때 최적화 비활성화" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:193 msgid "Trace clipping" msgstr "클리핑 추적" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:194 msgid "Logs information about how Cogl is implementing clipping" msgstr "코글의 클리핑 구현 방법 정보를 기록" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:198 msgid "Trace performance concerns" msgstr "성능 고려 추적" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:199 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "차선의 코글 사용 강조를 시도함." Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/lt.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/lt.gmo differ diff -Nru cogl-1.22.0/po/lt.po cogl-1.22.2/po/lt.po --- cogl-1.22.0/po/lt.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/lt.po 2016-02-23 12:06:45.000000000 +0000 @@ -6,9 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: cogl master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-09-25 23:19+0000\n" "PO-Revision-Date: 2012-09-27 21:58+0300\n" "Last-Translator: Aurimas Černius \n" "Language-Team: Lithuanian \n" @@ -16,351 +15,355 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" -"%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Palaikomos derinimo reikšmės:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Specialios derinimo reikšmės:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Įjungia visas ne-elgsenos derinimo parinktis" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Papildomi aplinkos kintamieji:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "Kableliais skiriamas GL plėtinių sąrašas, kurį laikyti išjungtu" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "GL versija, kurią Cogl turi laikyti, kad tvarkyklė palaiko" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:237 msgid "Cogl debugging flags to set" msgstr "Nustatomi Cogl derinimo požymiai" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:239 msgid "Cogl debugging flags to unset" msgstr "Nuimami Cogl derinimo požymiai" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:288 msgid "Cogl Options" msgstr "Cogl parinktys" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:289 msgid "Show Cogl options" msgstr "Rodyti Cogl parinktis" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 +#: ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 +#: ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 +#: ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Cogl sekimas" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "CoglObject nuorodos" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Derinti nuorodų skaičiavimo problemas CoglObject'ams" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Sekti rašto kirpimus" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "derinti raštų iškarpų sukūrimus" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Sekti atlaso raštus" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Derinti raštų atlaso valdymą" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Sekti derinimo eilutes" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Derinti CoglBlendString skaitymą" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Sekti žurnalą" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Rodyti visą geometrijos perdavimą per žurnalą" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Sekti darbų partijas" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Rodyti, kaip geometrija grupuojama žurnale" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Sekti matricas" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Sekti visą matricų manipuliavimą" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Sekti įvairų piešimą" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Sekti dalį įvairių piešimo veiksmų" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Sekti Pango piešėją" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Sekti Cogl Pango piešėją" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Sekti CoglTexturePixmap realizaciją" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Sekti Cogl rašto pikselių žemėlapio realizaciją" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Pateikti" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Apibrėžti stačiakampius" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Apibrėžti visą stačiakampę geometriją" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Rodyti apibrėžimus" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Apibrėžti visą geometriją" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 +#: ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 +#: ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Pagrindinė priežastis" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Išjungti žurnalo grupavimą" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Išjungti geometrijos grupavimą Cogl žurnale" -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Išjungti GL viršūnių buferius" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Išjungti OpenGL viršūnių buferių naudojimą" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Išjungti GL pikselių buferius" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Išjungti OpenGL pikselių buferių objektus" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Išjungti programinį stačiakampių transformavimą" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Naudoti GPU stačiakampės geometrijos transformavimui" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Cogl specialistas" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Iškloti atlaso paveikslėlius" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Iškloti raštų atlaso pasikeitimus į paveikslėlio failą" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Išjungti raštų atlasą" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Išjungti raštų atlaso naudojimą" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "Išjungti raštų atlaso dalijimąsi tarp teksto ir paveikslėlių" -#: cogl/cogl-debug-options.h:126 -msgid "" -"When this is set the glyph cache will always use a separate texture for its " -"atlas. Otherwise it will try to share the atlas with images." -msgstr "" -"Kai tai nustatyta, paveikslėlių podėlis visada naudos atskirą raštą savo " -"atlasui. Priešingu atveju jis mėgins dalytis atlasu su paveikslėliais." +#: ../cogl/cogl-debug-options.h:119 +msgid "When this is set the glyph cache will always use a separate texture for its atlas. Otherwise it will try to share the atlas with images." +msgstr "Kai tai nustatyta, paveikslėlių podėlis visada naudos atskirą raštą savo atlasui. Priešingu atveju jis mėgins dalytis atlasu su paveikslėliais." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Išjungti raštus" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Išjungti bet kokių primityvų raštus" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Išjungti arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Išjungti ARB fragmentų programų naudojimą" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Išjungti fiksuotą" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Išjungti fiksuotos funkcijos konvejerio realizacijos naudojimą" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Išjungti GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Išjungti GLSL naudojimą" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Išjungti derinimą" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Išjungti derinimo naudojimą" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Išjungti ne dvejeto laipsnių raštus" -#: cogl/cogl-debug-options.h:157 -msgid "" -"Makes Cogl think that the GL driver doesn't support NPOT textures so that it " -"will create sliced textures or textures with waste instead." -msgstr "" -"Priverčia Cogl galvoti, kad GL tvarkyklė nepalaiko NPOT raštų, todėl tai " -"sukurs karpytus raštus arba raštus su šiukšlėmis." +#: ../cogl/cogl-debug-options.h:150 +msgid "Makes Cogl think that the GL driver doesn't support NPOT textures so that it will create sliced textures or textures with waste instead." +msgstr "Priverčia Cogl galvoti, kad GL tvarkyklė nepalaiko NPOT raštų, todėl tai sukurs karpytus raštus arba raštus su šiukšlėmis." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Išjungti programinė karpymą" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." -msgstr "" -"Išjungia Cogl bandymus iškirpti kai kuriuos stačiakampius programiškai." +msgstr "Išjungia Cogl bandymus iškirpti kai kuriuos stačiakampius programiškai." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Rodyti išeities tekstą" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Parodo sugeneruotą ARBfp/GLSL išeities tekstą" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Sekti dalį OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Seka kai kuriuos pasirinktus OpenGL kvietinius" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Sekti už ekrano palaikymą" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Derinti už ekrano palaikymą" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Išjungti programos podėlį" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Išjungti atsarginius podėlius arbfp ir glsl programoms" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Išjungti pikselių skaitymo optimizaciją" -#: cogl/cogl-debug-options.h:188 -msgid "" -"Disable optimization for reading 1px for simple scenes of opaque rectangles" -msgstr "" -"Išjungti vieno pikselio skaitymo optimizavimą paprastoms nepermatomų " -"stačiakampių scenoms" +#: ../cogl/cogl-debug-options.h:181 +msgid "Disable optimization for reading 1px for simple scenes of opaque rectangles" +msgstr "Išjungti vieno pikselio skaitymo optimizavimą paprastoms nepermatomų stačiakampių scenoms" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Sekti karpymą" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Įrašo į žurnalą, kaip Cogl realizuoja karpymą" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Sekti našumo rūpesčius" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Mėgina išryškinti neoptimalų Cogl naudojimą." + Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/lv.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/lv.gmo differ diff -Nru cogl-1.22.0/po/lv.po cogl-1.22.2/po/lv.po --- cogl-1.22.0/po/lv.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/lv.po 2016-02-23 12:06:45.000000000 +0000 @@ -7,7 +7,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"POT-Creation-Date: 2012-09-26 12:01+0300\n" "PO-Revision-Date: 2012-09-26 12:02+0300\n" "Last-Translator: Rūdolfs Mazurs \n" "Language-Team: Latvian \n" @@ -19,227 +19,227 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " "2);\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Atbalstītās atkļūdošanas vērtības:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Īpašās atkļūdošanas vērtības:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Aktivē visas ne-uzvedības atkļūdošanas opcijas" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Papildu vides mainīgie:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "" "Ar komatiem atdalīts saraksts ar GL paplašinājumiem, kas uzskatāmi par " "deaktivētiem" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "Pārrakstīt GL versiju, ko Cogl uzskatīs, ka atbalsta draiveris" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:237 msgid "Cogl debugging flags to set" msgstr "Iestatāmie Cogl atkļūdošanas karodziņi" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:239 msgid "Cogl debugging flags to unset" msgstr "Noņemamie Cogl atkļūdošanas karodziņi" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:288 msgid "Cogl Options" msgstr "Cogl opcijas" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:289 msgid "Show Cogl options" msgstr "Rādīt Cogl opcijas" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Cogl izsekošana" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "CoglObject atsauces" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Atkļūdot atsauču skaitīšanas problēmas priekš CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Izsekot tekstūru griešanai" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "atkļūdot tekstūru gabalu veidošanu" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Izsekot atlanta tekstūras" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Atkļūdot tekstūru atlanta pārvaldīšanu" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Izsekot sapludinātās virknes" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Atkļūdot CoglBlendString parsēšanu" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Izsekošanas žurnāls" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Skatīt visu ģeometriju, kas iet cauri žurnālam" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Izsekot paketēm" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Rādīt, kā ģeometrija tiek paketēta žurnālā" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Izsekot matricām" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Izsekot visām matricu manipulācijām" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Izsekot dažādiem zīmējumiem" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Izsekot dažādām zīmēšanas darbībām" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Izsekot Pango renderētāju" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Izsekot Cogl Pango renderētāju" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Izsekot CoglTexturePixmap aizmuguri" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Izsekot Cogl tekstūras pikseļu kartes aizmuguri" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Vizualizēt" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Izcelt taisnstūrus" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Pievienot karkasattēlojumu visām taisnstūra ģeometrijām" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Rādīt karkasattēlojumu" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Pievienot karkasattēlojumu visām ģeometrijām" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Pamatcēlonis" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Deaktivēt žurnāla paketēšanu" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Deaktivēt ģeometriju paketēšanu Cogl žurnālā." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Deaktivēt GL virsotņu buferus" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Deaktivēt OpenGL virsotņu bufera objektu lietošanu" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Deaktivēt GL pikseļu buferus" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Deaktivēt OpenGL pikseļu bufera objektu lietošanu" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Deaktivēt programmatūras taisnstūru transformācijas" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Izmantot GPU, lai transformētu taisnstūra ģeometrijas" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Cogl speciālists" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Nomest atlanta attēlus" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Nomest tekstūru atlanta izmaiņas attēla failā" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Deaktivēt tekstūru nogludināšanu" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Deaktivēt tekstūru nogludināšanas izmantošanu" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "Deaktivēt tekstūru atlanta koplietošanu starp tekstu un attēliem" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -247,51 +247,51 @@ "Kad tas ir iestatīts, glifu kešs atlantam vienmēr izmantos atsevišķu " "tekstūru. Citādi tas mēģinās koplietot atlantu ar attēliem. " -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Deaktivēt teksturēšanu" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Deaktivēt visu primitīvu teksturēšanu" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Deaktivēt arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Deaktivēt ARB fragmentu programmu lietošanu" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Deaktivēt fiksētos" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Deaktivēt fiksētu funkciju konveijera aizmugures izmantošanu" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Deaktivēt GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Deaktivēt GLSL izmantošanu" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Deaktivēt sajaukšanu" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Deaktivēt sajaukšanas izmantošanu" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Deaktivēt nav-divnieka-pakāpe tekstūras" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -299,69 +299,70 @@ "Liek Cogl domāt, ka GL draiveris neatbalsta NPOT tekstūras, tā vietā tas " "veidos sagrieztas tekstūras vai tekstūras ar liekām daļām." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Deaktivēt programmatūras apcirpšanu" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "Deaktivē Cogl mēģinājumus apcirpt dažus taisnstūrus programmatūrā." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Rādīt avotu" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Rādīt ģenerētu ARBfp/GLSL pirmkodu" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Izsekot kādu OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Izsekot dažus īpašus OpenGL izsaukumus" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Izsekot ārpusekrāna atbalstu" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Atkļūdot ārpusekrāna atbalstu" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Deaktivēt programmas kešu" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Deaktivēt atkāpšanās kešu arbfp un glsl programmām" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Deaktivēt pikseļu lasīšanas optimizāciju" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Deaktivēt optimizēšanu 1px nolasīšanai vienkāršām necaurspīdīgu taisnstūru " "ainām " -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Izsekot apcirpšanu" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Reģistrē informāciju par to, kā Cogl implementē apciršanu" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Izsekot veiktspējas problēmas" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Mēģina izcelt neoptimālu Cogl lietojumu." + diff -Nru cogl-1.22.0/po/Makefile.in.in cogl-1.22.2/po/Makefile.in.in --- cogl-1.22.0/po/Makefile.in.in 2015-09-16 14:00:37.000000000 +0000 +++ cogl-1.22.2/po/Makefile.in.in 2016-08-26 17:33:38.000000000 +0000 @@ -1,5 +1,5 @@ # Makefile for PO directory in any package using GNU gettext. -# Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper +# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper # # This file can be copied and used freely without restrictions. It can # be used in projects which are not available under the GNU General Public @@ -8,13 +8,14 @@ # Please note that the actual code of GNU gettext is covered by the GNU # General Public License and is *not* in the public domain. # -# Origin: gettext-0.17 -GETTEXT_MACRO_VERSION = 0.17 +# Origin: gettext-0.19 +GETTEXT_MACRO_VERSION = 0.19 PACKAGE = @PACKAGE@ VERSION = @VERSION@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +SED = @SED@ SHELL = /bin/sh @SET_MAKE@ @@ -76,6 +77,16 @@ CATALOGS = @CATALOGS@ +POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot +POFILESDEPS_yes = $(POFILESDEPS_) +POFILESDEPS_no = +POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT)) + +DISTFILESDEPS_ = update-po +DISTFILESDEPS_yes = $(DISTFILESDEPS_) +DISTFILESDEPS_no = +DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO)) + # Makevars gets inserted here. (Don't remove this line!) .SUFFIXES: @@ -88,22 +99,22 @@ .po.gmo: @lang=`echo $* | sed -e 's,.*/,,'`; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ - cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo + echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \ + cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo .sin.sed: sed -e '/^#/d' $< > t-$@ mv t-$@ $@ -all: check-macro-version all-@USE_NLS@ +all: all-@USE_NLS@ all-yes: stamp-po all-no: # Ensure that the gettext macros and this Makefile.in.in are in sync. -check-macro-version: - @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ +CHECK_MACRO_VERSION = \ + test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \ exit 1; \ } @@ -123,6 +134,7 @@ # $(POFILES) has been designed to not touch files that don't need to be # changed. stamp-po: $(srcdir)/$(DOMAIN).pot + @$(CHECK_MACRO_VERSION) test ! -f $(srcdir)/$(DOMAIN).pot || \ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) @test ! -f $(srcdir)/$(DOMAIN).pot || { \ @@ -137,11 +149,29 @@ # This target rebuilds $(DOMAIN).pot; it is an expensive operation. # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. +# The determination of whether the package xyz is a GNU one is based on the +# heuristic whether some file in the top level directory mentions "GNU xyz". +# If GNU 'find' is available, we avoid grepping through monster files. $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed - if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \ - package_gnu='GNU '; \ + package_gnu="$(PACKAGE_GNU)"; \ + test -n "$$package_gnu" || { \ + if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ + LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \ + -size -10000000c -exec grep 'GNU @PACKAGE@' \ + /dev/null '{}' ';' 2>/dev/null; \ + else \ + LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ + fi; \ + } | grep -v 'libtool:' >/dev/null; then \ + package_gnu=yes; \ + else \ + package_gnu=no; \ + fi; \ + }; \ + if test "$$package_gnu" = "yes"; then \ + package_prefix='GNU '; \ else \ - package_gnu=''; \ + package_prefix=''; \ fi; \ if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ @@ -161,7 +191,7 @@ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ --files-from=$(srcdir)/POTFILES.in \ --copyright-holder='$(COPYRIGHT_HOLDER)' \ - --package-name="$${package_gnu}@PACKAGE@" \ + --package-name="$${package_prefix}@PACKAGE@" \ --package-version='@VERSION@' \ --msgid-bugs-address="$$msgid_bugs_address" \ ;; \ @@ -189,12 +219,20 @@ # This target rebuilds a PO file if $(DOMAIN).pot has changed. # Note that a PO file is not touched if it doesn't need to be changed. -$(POFILES): $(srcdir)/$(DOMAIN).pot +$(POFILES): $(POFILESDEPS) @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ + test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ - cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ + cd $(srcdir) \ + && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ + *) \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \ + esac; \ + }; \ else \ $(MAKE) $${lang}.po-create; \ fi @@ -217,7 +255,6 @@ fi install-data-no: all install-data-yes: all - $(mkdir_p) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ @@ -269,7 +306,6 @@ fi installdirs-data-no: installdirs-data-yes: - $(mkdir_p) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ @@ -347,7 +383,7 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: - $(MAKE) update-po + test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS) @$(MAKE) dist2 # This is a separate target because 'update-po' must be executed before. dist2: stamp-po $(DISTFILES) @@ -395,9 +431,15 @@ tmpdir=`pwd`; \ echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ - if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ + if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + *) \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + esac; \ + }; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ @@ -418,9 +460,13 @@ update-gmo: Makefile $(GMOFILES) @: +# Recreate Makefile by invoking config.status. Explicitly invoke the shell, +# because execution permission bits may not work on the current file system. +# Use @SHELL@, which is the shell determined by autoconf for the use by its +# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient. Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ cd $(top_builddir) \ - && $(SHELL) ./config.status $(subdir)/$@.in po-directories + && @SHELL@ ./config.status $(subdir)/$@.in po-directories force: diff -Nru cogl-1.22.0/po/Makevars cogl-1.22.2/po/Makevars --- cogl-1.22.0/po/Makevars 2013-09-22 17:15:55.000000000 +0000 +++ cogl-1.22.2/po/Makevars 2016-02-23 12:06:45.000000000 +0000 @@ -20,6 +20,13 @@ # their copyright. COPYRIGHT_HOLDER = Free Software Foundation, Inc. +# This tells whether or not to prepend "GNU " prefix to the package +# name that gets inserted into the header of the $(DOMAIN).pot file. +# Possible values are "yes", "no", or empty. If it is empty, try to +# detect it automatically by scanning the files in $(top_srcdir) for +# "GNU packagename" string. +PACKAGE_GNU = + # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: # - Strings which are not entire sentences, see the maintainer guidelines @@ -39,3 +46,33 @@ # This is the list of locale categories, beyond LC_MESSAGES, for which the # message catalogs shall be used. It is usually empty. EXTRA_LOCALE_CATEGORIES = + +# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' +# context. Possible values are "yes" and "no". Set this to yes if the +# package uses functions taking also a message context, like pgettext(), or +# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. +USE_MSGCTXT = no + +# These options get passed to msgmerge. +# Useful options are in particular: +# --previous to keep previous msgids of translated messages, +# --quiet to reduce the verbosity. +MSGMERGE_OPTIONS = + +# These options get passed to msginit. +# If you want to disable line wrapping when writing PO files, add +# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and +# MSGINIT_OPTIONS. +MSGINIT_OPTIONS = + +# This tells whether or not to regenerate a PO file when $(DOMAIN).pot +# has changed. Possible values are "yes" and "no". Set this to no if +# the POT file is checked in the repository and the version control +# program ignores timestamps. +PO_DEPENDS_ON_POT = no + +# This tells whether or not to forcibly update $(DOMAIN).pot and +# regenerate PO files on "make dist". Possible values are "yes" and +# "no". Set this to no if the POT file and PO files are maintained +# externally. +DIST_DEPENDS_ON_UPDATE_PO = no Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/ml.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/ml.gmo differ diff -Nru cogl-1.22.0/po/ml.po cogl-1.22.2/po/ml.po --- cogl-1.22.0/po/ml.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/ml.po 2016-02-23 12:06:45.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-09-20 05:21+0000\n" "PO-Revision-Date: 2012-09-20 19:26+0530\n" "Last-Translator: Anish A \n" "Language-Team: Swatantra Malayalam Computing\n" @@ -18,341 +18,325 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Virtaal 0.6.1\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "" -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "മൂലകാരണം" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "" -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." msgstr "" -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." msgstr "" -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "സോഴ്സ് കോഡ് കാണിക്കുക" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/nb.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/nb.gmo differ diff -Nru cogl-1.22.0/po/nb.po cogl-1.22.2/po/nb.po --- cogl-1.22.0/po/nb.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/nb.po 2016-08-26 16:18:04.000000000 +0000 @@ -8,351 +8,351 @@ "Project-Id-Version: cogl 1.11.x\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"POT-Creation-Date: 2014-02-12 20:24+0100\n" "PO-Revision-Date: 2014-02-12 20:25+0100\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian bokmål \n" -"Language: \n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Støttede feilsøkingsverdier:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Spesielle feilsøkingsverdier:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "" "Slår på alle feilsøkingsalternativer som ikke har med oppførsel å gjøre" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:237 msgid "Cogl debugging flags to set" msgstr "" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:239 msgid "Cogl debugging flags to unset" msgstr "" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:288 msgid "Cogl Options" msgstr "Alternativer for Cogl" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:289 msgid "Show Cogl options" msgstr "Vis alternativer for Cogl" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Cogl-sporing" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "CoglObject-referanser" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Feilsøk referansetellingsproblemer for CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Visualiser" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Vis rutenett" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Rotårsak" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "" -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." msgstr "" -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Slå av GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Slå av bruk av GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." msgstr "" -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Vis kildekode" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/nl.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/nl.gmo differ diff -Nru cogl-1.22.0/po/nl.po cogl-1.22.2/po/nl.po --- cogl-1.22.0/po/nl.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/nl.po 2016-08-26 16:18:04.000000000 +0000 @@ -9,351 +9,330 @@ "Project-Id-Version: Cogl\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"POT-Creation-Date: 2012-03-05 23:14+0000\n" "PO-Revision-Date: 2011-09-06 00:51+0200\n" "Last-Translator: Wouter Bolsterlee \n" "Language-Team: Dutch \n" -"Language: \n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cogl/cogl-debug.c:181 +#: cogl/cogl-debug.c:172 msgid "Supported debug values:" msgstr "" -#: cogl/cogl-debug.c:186 +#: cogl/cogl-debug.c:177 msgid "Special debug values:" msgstr "" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: cogl/cogl-debug.c:179 cogl/cogl-debug.c:181 msgid "Enables all non-behavioural debug options" msgstr "" -#: cogl/cogl-debug.c:197 -msgid "Additional environment variables:" -msgstr "" - -#: cogl/cogl-debug.c:198 -msgid "Comma-separated list of GL extensions to pretend are disabled" -msgstr "" - -#: cogl/cogl-debug.c:200 -msgid "Override the GL version that Cogl will assume the driver supports" -msgstr "" - -#: cogl/cogl-debug.c:244 +#: cogl/cogl-debug.c:225 msgid "Cogl debugging flags to set" msgstr "In te schakelen Cogl-debugvlaggen" -#: cogl/cogl-debug.c:246 +#: cogl/cogl-debug.c:227 msgid "Cogl debugging flags to unset" msgstr "Uit te schakelen Cogl-debugvlaggen" -#: cogl/cogl-debug.c:295 +#: cogl/cogl-debug.c:276 msgid "Cogl Options" msgstr "Cogl-opties" -#: cogl/cogl-debug.c:296 +#: cogl/cogl-debug.c:277 msgid "Show Cogl options" msgstr "Cogl-opties tonen" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: cogl/cogl-debug-options.h:25 cogl/cogl-debug-options.h:30 +#: cogl/cogl-debug-options.h:35 cogl/cogl-debug-options.h:40 +#: cogl/cogl-debug-options.h:45 cogl/cogl-debug-options.h:50 +#: cogl/cogl-debug-options.h:55 cogl/cogl-debug-options.h:61 +#: cogl/cogl-debug-options.h:66 cogl/cogl-debug-options.h:71 +#: cogl/cogl-debug-options.h:158 cogl/cogl-debug-options.h:163 +#: cogl/cogl-debug-options.h:168 cogl/cogl-debug-options.h:184 msgid "Cogl Tracing" msgstr "" -#: cogl/cogl-debug-options.h:34 +#: cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "" -#: cogl/cogl-debug-options.h:35 +#: cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "" -#: cogl/cogl-debug-options.h:39 +#: cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "" -#: cogl/cogl-debug-options.h:40 +#: cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "" -#: cogl/cogl-debug-options.h:44 +#: cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "" -#: cogl/cogl-debug-options.h:45 +#: cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "" -#: cogl/cogl-debug-options.h:49 +#: cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "" -#: cogl/cogl-debug-options.h:50 +#: cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "" -#: cogl/cogl-debug-options.h:54 +#: cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "" -#: cogl/cogl-debug-options.h:55 +#: cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "" -#: cogl/cogl-debug-options.h:59 +#: cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "" -#: cogl/cogl-debug-options.h:60 +#: cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "" -#: cogl/cogl-debug-options.h:64 +#: cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "" -#: cogl/cogl-debug-options.h:65 +#: cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "" -#: cogl/cogl-debug-options.h:70 +#: cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "" -#: cogl/cogl-debug-options.h:71 +#: cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "" -#: cogl/cogl-debug-options.h:75 +#: cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "" -#: cogl/cogl-debug-options.h:76 +#: cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "" -#: cogl/cogl-debug-options.h:80 +#: cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:81 +#: cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: cogl/cogl-debug-options.h:76 cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "" -#: cogl/cogl-debug-options.h:85 +#: cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "" -#: cogl/cogl-debug-options.h:86 +#: cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:90 +#: cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "" -#: cogl/cogl-debug-options.h:91 +#: cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: cogl/cogl-debug-options.h:86 cogl/cogl-debug-options.h:91 +#: cogl/cogl-debug-options.h:96 cogl/cogl-debug-options.h:101 +#: cogl/cogl-debug-options.h:111 cogl/cogl-debug-options.h:116 +#: cogl/cogl-debug-options.h:122 cogl/cogl-debug-options.h:127 +#: cogl/cogl-debug-options.h:132 cogl/cogl-debug-options.h:137 +#: cogl/cogl-debug-options.h:142 cogl/cogl-debug-options.h:147 +#: cogl/cogl-debug-options.h:153 cogl/cogl-debug-options.h:173 +#: cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "" -#: cogl/cogl-debug-options.h:95 +#: cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "" -#: cogl/cogl-debug-options.h:96 +#: cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "" -#: cogl/cogl-debug-options.h:100 +#: cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "" -#: cogl/cogl-debug-options.h:101 +#: cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:105 +#: cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "" -#: cogl/cogl-debug-options.h:106 +#: cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:110 +#: cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "" -#: cogl/cogl-debug-options.h:111 +#: cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:113 +#: cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "" -#: cogl/cogl-debug-options.h:115 +#: cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "" -#: cogl/cogl-debug-options.h:116 +#: cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "" -#: cogl/cogl-debug-options.h:120 +#: cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:121 +#: cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:125 +#: cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "" -#: cogl/cogl-debug-options.h:126 +#: cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." msgstr "" -#: cogl/cogl-debug-options.h:131 +#: cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "" -#: cogl/cogl-debug-options.h:132 +#: cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "" -#: cogl/cogl-debug-options.h:136 +#: cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "" -#: cogl/cogl-debug-options.h:137 +#: cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "" -#: cogl/cogl-debug-options.h:141 +#: cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "" -#: cogl/cogl-debug-options.h:142 +#: cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "" -#: cogl/cogl-debug-options.h:146 +#: cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "" -#: cogl/cogl-debug-options.h:147 +#: cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "" -#: cogl/cogl-debug-options.h:151 +#: cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "" -#: cogl/cogl-debug-options.h:152 +#: cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "" -#: cogl/cogl-debug-options.h:156 +#: cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "" -#: cogl/cogl-debug-options.h:157 +#: cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." msgstr "" -#: cogl/cogl-debug-options.h:162 +#: cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "" -#: cogl/cogl-debug-options.h:163 +#: cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" -#: cogl/cogl-debug-options.h:167 +#: cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "" -#: cogl/cogl-debug-options.h:168 +#: cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "" -#: cogl/cogl-debug-options.h:172 +#: cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "" -#: cogl/cogl-debug-options.h:173 +#: cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "" -#: cogl/cogl-debug-options.h:177 +#: cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:178 +#: cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:182 +#: cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "" -#: cogl/cogl-debug-options.h:183 +#: cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "" -#: cogl/cogl-debug-options.h:187 +#: cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "" -#: cogl/cogl-debug-options.h:188 +#: cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" -#: cogl/cogl-debug-options.h:193 +#: cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "" -#: cogl/cogl-debug-options.h:194 +#: cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "" - -#: cogl/cogl-debug-options.h:198 -msgid "Trace performance concerns" -msgstr "" - -#: cogl/cogl-debug-options.h:199 -msgid "Tries to highlight sub-optimal Cogl usage." -msgstr "" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/oc.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/oc.gmo differ diff -Nru cogl-1.22.0/po/oc.po cogl-1.22.2/po/oc.po --- cogl-1.22.0/po/oc.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/oc.po 2016-08-26 16:18:04.000000000 +0000 @@ -2,15 +2,16 @@ # Copyright (C) 2011-12 Listed translators # This file is distributed under the same license as the cogl package. # Cédric Valmary (Tot en òc) , 2015. +# Cédric Valmary (totenoc.eu) , 2016. msgid "" msgstr "" "Project-Id-Version: cogl master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" -"PO-Revision-Date: 2015-05-30 22:22+0200\n" -"Last-Translator: Cédric Valmary (Tot en òc) \n" -"Language-Team: Tot en òc (totenoc.eu)\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=cogl&ke" +"ywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2016-05-19 15:21+0000\n" +"PO-Revision-Date: 2016-05-29 20:30+0200\n" +"Last-Translator: Cédric Valmary (totenoc.eu) \n" +"Language-Team: Tot En Òc\n" "Language: oc\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -48,19 +49,19 @@ #: cogl/cogl-debug.c:244 msgid "Cogl debugging flags to set" -msgstr "Drapeaux de débogage Cogl à définir" +msgstr "Bandièras de desbugatge Cogl de definir" #: cogl/cogl-debug.c:246 msgid "Cogl debugging flags to unset" -msgstr "Drapeaux de débogage Cogl à annuler" +msgstr "Bandièras de desbugatge Cogl d'anullar" #: cogl/cogl-debug.c:295 msgid "Cogl Options" -msgstr "Options Cogl" +msgstr "Opcions Cogl" #: cogl/cogl-debug.c:296 msgid "Show Cogl options" -msgstr "Affiche les options Cogl" +msgstr "Aficha las opcions Cogl" #: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 #: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 @@ -71,7 +72,7 @@ #: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 #: cogl/cogl-debug-options.h:196 msgid "Cogl Tracing" -msgstr "Traçage de Cogl" +msgstr "Traçatge de Cogl" #: cogl/cogl-debug-options.h:34 msgid "CoglObject references" @@ -155,7 +156,7 @@ #: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 msgid "Visualize" -msgstr "Visualizar" +msgstr "Afichar" #: cogl/cogl-debug-options.h:85 msgid "Outline rectangles" @@ -249,9 +250,9 @@ "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." msgstr "" -"Quand aquò es activat, l'escondedor dels glifes ensajarà totjorn d'utilizar " -"una textura separada per son atlàs. Autrament, ensajarà de partejar l'atlàs " -"amb los imatges." +"Quand aquò es activat, lo cache dels glifes ensajarà totjorn d'utilizar una " +"textura separada per son atlàs. Autrament, ensajarà de partejar l'atlàs amb " +"los imatges." #: cogl/cogl-debug-options.h:131 msgid "Disable texturing" @@ -321,7 +322,7 @@ #: cogl/cogl-debug-options.h:168 msgid "Show generated ARBfp/GLSL source code" -msgstr "Aficha lo còde font ARBfp/GLSL produsit" +msgstr "Aficha lo còdi font ARBfp/GLSL produit" #: cogl/cogl-debug-options.h:172 msgid "Trace some OpenGL" @@ -341,11 +342,11 @@ #: cogl/cogl-debug-options.h:182 msgid "Disable program caches" -msgstr "Desactivar los escondedors de programa" +msgstr "Desactivar los caches de programa" #: cogl/cogl-debug-options.h:183 msgid "Disable fallback caches for arbfp and glsl programs" -msgstr "Desactiva los escondedors d'urgéncia pels programas arbfp e glsl" +msgstr "Desactiva los caches d'urgéncia pels programas arbfp e glsl" #: cogl/cogl-debug-options.h:187 msgid "Disable read pixel optimization" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/or.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/or.gmo differ diff -Nru cogl-1.22.0/po/or.po cogl-1.22.2/po/or.po --- cogl-1.22.0/po/or.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/or.po 2016-02-23 12:06:45.000000000 +0000 @@ -8,7 +8,7 @@ "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"POT-Creation-Date: 2012-03-05 23:14+0000\n" "PO-Revision-Date: 2011-09-09 11:10+0530\n" "Last-Translator: Manoj Kumar Giri \n" "Language-Team: Oriya \n" @@ -19,341 +19,320 @@ "X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: cogl/cogl-debug.c:181 +#: cogl/cogl-debug.c:172 msgid "Supported debug values:" msgstr "" -#: cogl/cogl-debug.c:186 +#: cogl/cogl-debug.c:177 msgid "Special debug values:" msgstr "" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: cogl/cogl-debug.c:179 cogl/cogl-debug.c:181 msgid "Enables all non-behavioural debug options" msgstr "" -#: cogl/cogl-debug.c:197 -msgid "Additional environment variables:" -msgstr "" - -#: cogl/cogl-debug.c:198 -msgid "Comma-separated list of GL extensions to pretend are disabled" -msgstr "" - -#: cogl/cogl-debug.c:200 -msgid "Override the GL version that Cogl will assume the driver supports" -msgstr "" - -#: cogl/cogl-debug.c:244 +#: cogl/cogl-debug.c:225 msgid "Cogl debugging flags to set" msgstr "ସେଟ କରିବା ପାଇଁ Cogl ତ୍ରୁଟି ନିବାରଣ ପତାକାଗୁଡ଼ିକ" -#: cogl/cogl-debug.c:246 +#: cogl/cogl-debug.c:227 msgid "Cogl debugging flags to unset" msgstr "ସେଟ ନକରିବା ପାଇଁ Cogl ତ୍ରୁଟି ନିବାରଣ ପତାକାଗୁଡ଼ିକ" -#: cogl/cogl-debug.c:295 +#: cogl/cogl-debug.c:276 msgid "Cogl Options" msgstr "Cogl ବିକଳ୍ପଗୁଡିକ" -#: cogl/cogl-debug.c:296 +#: cogl/cogl-debug.c:277 msgid "Show Cogl options" msgstr "Cogl ବିକଳ୍ପଗୁଡିକୁ ଦେଖାନ୍ତୁ" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: cogl/cogl-debug-options.h:25 cogl/cogl-debug-options.h:30 +#: cogl/cogl-debug-options.h:35 cogl/cogl-debug-options.h:40 +#: cogl/cogl-debug-options.h:45 cogl/cogl-debug-options.h:50 +#: cogl/cogl-debug-options.h:55 cogl/cogl-debug-options.h:61 +#: cogl/cogl-debug-options.h:66 cogl/cogl-debug-options.h:71 +#: cogl/cogl-debug-options.h:158 cogl/cogl-debug-options.h:163 +#: cogl/cogl-debug-options.h:168 cogl/cogl-debug-options.h:184 msgid "Cogl Tracing" msgstr "" -#: cogl/cogl-debug-options.h:34 +#: cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "" -#: cogl/cogl-debug-options.h:35 +#: cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "" -#: cogl/cogl-debug-options.h:39 +#: cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "" -#: cogl/cogl-debug-options.h:40 +#: cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "" -#: cogl/cogl-debug-options.h:44 +#: cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "" -#: cogl/cogl-debug-options.h:45 +#: cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "" -#: cogl/cogl-debug-options.h:49 +#: cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "" -#: cogl/cogl-debug-options.h:50 +#: cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "" -#: cogl/cogl-debug-options.h:54 +#: cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "" -#: cogl/cogl-debug-options.h:55 +#: cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "" -#: cogl/cogl-debug-options.h:59 +#: cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "" -#: cogl/cogl-debug-options.h:60 +#: cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "" -#: cogl/cogl-debug-options.h:64 +#: cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "" -#: cogl/cogl-debug-options.h:65 +#: cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "" -#: cogl/cogl-debug-options.h:70 +#: cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "" -#: cogl/cogl-debug-options.h:71 +#: cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "" -#: cogl/cogl-debug-options.h:75 +#: cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "" -#: cogl/cogl-debug-options.h:76 +#: cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "" -#: cogl/cogl-debug-options.h:80 +#: cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:81 +#: cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: cogl/cogl-debug-options.h:76 cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "" -#: cogl/cogl-debug-options.h:85 +#: cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "" -#: cogl/cogl-debug-options.h:86 +#: cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:90 +#: cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "" -#: cogl/cogl-debug-options.h:91 +#: cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: cogl/cogl-debug-options.h:86 cogl/cogl-debug-options.h:91 +#: cogl/cogl-debug-options.h:96 cogl/cogl-debug-options.h:101 +#: cogl/cogl-debug-options.h:111 cogl/cogl-debug-options.h:116 +#: cogl/cogl-debug-options.h:122 cogl/cogl-debug-options.h:127 +#: cogl/cogl-debug-options.h:132 cogl/cogl-debug-options.h:137 +#: cogl/cogl-debug-options.h:142 cogl/cogl-debug-options.h:147 +#: cogl/cogl-debug-options.h:153 cogl/cogl-debug-options.h:173 +#: cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "" -#: cogl/cogl-debug-options.h:95 +#: cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "" -#: cogl/cogl-debug-options.h:96 +#: cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "" -#: cogl/cogl-debug-options.h:100 +#: cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "" -#: cogl/cogl-debug-options.h:101 +#: cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:105 +#: cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "" -#: cogl/cogl-debug-options.h:106 +#: cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:110 +#: cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "" -#: cogl/cogl-debug-options.h:111 +#: cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:113 +#: cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "" -#: cogl/cogl-debug-options.h:115 +#: cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "" -#: cogl/cogl-debug-options.h:116 +#: cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "" -#: cogl/cogl-debug-options.h:120 +#: cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:121 +#: cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:125 +#: cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "" -#: cogl/cogl-debug-options.h:126 +#: cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." msgstr "" -#: cogl/cogl-debug-options.h:131 +#: cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "" -#: cogl/cogl-debug-options.h:132 +#: cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "" -#: cogl/cogl-debug-options.h:136 +#: cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "" -#: cogl/cogl-debug-options.h:137 +#: cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "" -#: cogl/cogl-debug-options.h:141 +#: cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "" -#: cogl/cogl-debug-options.h:142 +#: cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "" -#: cogl/cogl-debug-options.h:146 +#: cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "" -#: cogl/cogl-debug-options.h:147 +#: cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "" -#: cogl/cogl-debug-options.h:151 +#: cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "" -#: cogl/cogl-debug-options.h:152 +#: cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "" -#: cogl/cogl-debug-options.h:156 +#: cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "" -#: cogl/cogl-debug-options.h:157 +#: cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." msgstr "" -#: cogl/cogl-debug-options.h:162 +#: cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "" -#: cogl/cogl-debug-options.h:163 +#: cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" -#: cogl/cogl-debug-options.h:167 +#: cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "" -#: cogl/cogl-debug-options.h:168 +#: cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "" -#: cogl/cogl-debug-options.h:172 +#: cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "" -#: cogl/cogl-debug-options.h:173 +#: cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "" -#: cogl/cogl-debug-options.h:177 +#: cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:178 +#: cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:182 +#: cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "" -#: cogl/cogl-debug-options.h:183 +#: cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "" -#: cogl/cogl-debug-options.h:187 +#: cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "" -#: cogl/cogl-debug-options.h:188 +#: cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" -#: cogl/cogl-debug-options.h:193 +#: cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "" -#: cogl/cogl-debug-options.h:194 +#: cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "" - -#: cogl/cogl-debug-options.h:198 -msgid "Trace performance concerns" -msgstr "" - -#: cogl/cogl-debug-options.h:199 -msgid "Tries to highlight sub-optimal Cogl usage." -msgstr "" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/pa.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/pa.gmo differ diff -Nru cogl-1.22.0/po/pa.po cogl-1.22.2/po/pa.po --- cogl-1.22.0/po/pa.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/pa.po 2016-02-23 12:06:45.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-08-01 10:44+0000\n" "PO-Revision-Date: 2012-08-17 07:27+0530\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi/Panjabi \n" @@ -19,341 +19,337 @@ "X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "ਸਹਾਇਕ ਡੀਬੱਗ ਮੁੱਲ:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "ਖਾਸ ਡੀਬੱਗ ਮੁੱਲ:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "ਵਾਧੂ ਇੰਵਾਇਰਨਮੈਂਟ ਮੁੱਲ:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "" -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "ਸੈੱਟ ਕਰਨ ਲਈ Cogl ਡੀਬੱਗ ਫਲੈਗ" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "ਅਣ-ਸੈੱਟ ਕਰਨ ਲਈ Cogl ਡੀਬੱਗਿੰਗ ਨਿਸ਼ਾਨ" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "Cogl ਚੋਣਾਂ" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "Cogl ਚੋਣਾਂ ਵੇਖਾਓ" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "ਕੋਗਲ ਟਰੇਸਿੰਗ" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "ਟਰੇਸ ਬਲੈਂਡ ਲਾਈਨਾਂ" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "ਟਰੇਸ ਜਰਨਲ" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "ਟਰੇਸ ਬੈਚਿੰਗ" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "ਟਰੇਸ ਮੈਟਰਿਕਸ" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "ਫੁਟਕਲ ਡਰਾਇੰਗ ਟਰੇਸ" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "ਪੈਗੋ ਰੈਂਡਰ ਟਰੇਸ" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "ਦਿੱਖ" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "ਬਾਹਰੀ ਚਤੁਰਭੁਜ" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "ਬਾਹਰੀ ਢਾਂਚਾ ਵੇਖਾਓ" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "ਮੁੱਖ ਕਾਰਨ" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "" -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "ਸਾਫਟਵੇਅਰ ਰੈਕਟ ਟਰਾਂਸਫਰਮ ਆਯੋਗ" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "ਕੋਗਲ ਮਾਹਰ" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." msgstr "" -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "arbfp ਆਯੋਗ" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "GLSL ਆਯੋਗ" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." msgstr "" -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "ਸਾਫਟਵੇਅਰ ਕਲਿੱਪਿੰਗ ਬੰਦ" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "ਸਰੋਤ ਵੇਖਾਓ" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "ਆਫਸਕਰੀਨ ਸਹਿਯੋਗ ਟਰੇਸ" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "ਆਫਸਕਰੀਨ ਸਹਿਯੋਗ ਡੀਬੱਗ" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "ਪ੍ਰੋਗਰਾਮ ਕੈਸ਼ ਬੰਦ" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "ਟਰੇਸ ਕਲਿੱਪਿੰਗ" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "ਕਾਰਗੁਜ਼ਾਰੀ ਮੁੱਦੇ ਟਰੇਸ" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "" + +#~ msgid "Cogl debugging flags to set" +#~ msgstr "ਸੈੱਟ ਕਰਨ ਲਈ Cogl ਡੀਬੱਗ ਫਲੈਗ" + +#~ msgid "Cogl debugging flags to unset" +#~ msgstr "ਅਣ-ਸੈੱਟ ਕਰਨ ਲਈ Cogl ਡੀਬੱਗਿੰਗ ਨਿਸ਼ਾਨ" + +#~ msgid "Cogl Options" +#~ msgstr "Cogl ਚੋਣਾਂ" + +#~ msgid "Show Cogl options" +#~ msgstr "Cogl ਚੋਣਾਂ ਵੇਖਾਓ" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/pl.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/pl.gmo differ diff -Nru cogl-1.22.0/po/pl.po cogl-1.22.2/po/pl.po --- cogl-1.22.0/po/pl.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/pl.po 2016-08-26 16:18:04.000000000 +0000 @@ -1,28 +1,24 @@ -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Aviary.pl -# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz -# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: -# gnomepl@aviary.pl -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Piotr Drąg , 2011-2013. -# Aviary.pl , 2011-2013. +# Polish translation for cogl. +# Copyright © 2011-2016 the cogl authors. +# This file is distributed under the same license as the cogl package. +# Piotr Drąg , 2011-2016. +# Aviary.pl , 2011-2016. +# msgid "" msgstr "" "Project-Id-Version: cogl\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" -"PO-Revision-Date: 2013-02-16 21:21+0100\n" +"POT-Creation-Date: 2016-07-15 15:58+0000\n" +"PO-Revision-Date: 2016-08-22 20:58+0200\n" "Last-Translator: Piotr Drąg \n" -"Language-Team: Polish \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: Poland\n" #: cogl/cogl-debug.c:181 msgid "Supported debug values:" @@ -122,7 +118,7 @@ #: cogl/cogl-debug-options.h:60 msgid "Show how geometry is being batched in the journal" -msgstr "Wyświetla, jak wymiary są przetwarzane w dzienniku" +msgstr "Wyświetla, jak wymiary są przetwarzane w dzienniku" #: cogl/cogl-debug-options.h:64 msgid "Trace matrices" @@ -189,11 +185,11 @@ #: cogl/cogl-debug-options.h:95 msgid "Disable Journal batching" -msgstr "Wyłączenie przetwarzania w dzienniku" +msgstr "Wyłączenie przetwarzania w dzienniku" #: cogl/cogl-debug-options.h:96 msgid "Disable batching of geometry in the Cogl Journal." -msgstr "Wyłącza przetwarzanie wymiarów w dzienniku biblioteki Cogl." +msgstr "Wyłącza przetwarzanie wymiarów w dzienniku biblioteki Cogl." #: cogl/cogl-debug-options.h:100 msgid "Disable GL Vertex Buffers" @@ -241,7 +237,7 @@ #: cogl/cogl-debug-options.h:125 msgid "Disable sharing the texture atlas between text and images" -msgstr "Wyłączenie współdzielenia atlasu tekstur między tekstem a obrazami" +msgstr "Wyłączenie współdzielenia atlasu tekstur między tekstem a obrazami" #: cogl/cogl-debug-options.h:126 msgid "" @@ -249,8 +245,8 @@ "atlas. Otherwise it will try to share the atlas with images." msgstr "" "Jeśli ustawiono, to pamięć podręczna glifów zawsze będzie używała oddzielnej " -"tekstury dla swojego atlasu. W innym przypadku spróbuje współdzielić atlas z " -"obrazami." +"tekstury dla swojego atlasu. W innym przypadku spróbuje współdzielić atlas " +"z obrazami." #: cogl/cogl-debug-options.h:131 msgid "Disable texturing" @@ -294,7 +290,7 @@ #: cogl/cogl-debug-options.h:156 msgid "Disable non-power-of-two textures" -msgstr "Wyłącznie tekstur o rozmiarach niebędących potęgą liczby 2" +msgstr "Wyłącznie tekstur o rozmiarach niebędących potęgą liczby 2" #: cogl/cogl-debug-options.h:157 msgid "" @@ -344,7 +340,7 @@ #: cogl/cogl-debug-options.h:183 msgid "Disable fallback caches for arbfp and glsl programs" -msgstr "Wyłącza zapasowe pamięci podręczne dla programów ARBfp i GLSL" +msgstr "Wyłącza zapasowe pamięci podręczne dla programów ARBfp i GLSL" #: cogl/cogl-debug-options.h:187 msgid "Disable read pixel optimization" @@ -354,8 +350,8 @@ msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" -"Wyłącza optymalizację odczytywania 1 piksela dla prostych scen z " -"nieprzezroczystymi prostokątami" +"Wyłącza optymalizację odczytywania 1 piksela dla prostych scen " +"z nieprzezroczystymi prostokątami" #: cogl/cogl-debug-options.h:193 msgid "Trace clipping" @@ -364,7 +360,7 @@ #: cogl/cogl-debug-options.h:194 msgid "Logs information about how Cogl is implementing clipping" msgstr "" -"Zapisuje informacje o tym, jak biblioteka Cogl implementuje przycinanie" +"Zapisuje informacje o tym, jak biblioteka Cogl implementuje przycinanie" #: cogl/cogl-debug-options.h:198 msgid "Trace performance concerns" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/pt_BR.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/pt_BR.gmo differ diff -Nru cogl-1.22.0/po/pt_BR.po cogl-1.22.2/po/pt_BR.po --- cogl-1.22.0/po/pt_BR.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/pt_BR.po 2016-08-26 16:18:04.000000000 +0000 @@ -9,240 +9,240 @@ msgstr "" "Project-Id-Version: cogl\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-09-29 16:02+0000\n" "PO-Revision-Date: 2012-09-30 23:10-0300\n" "Last-Translator: Rafael Ferreira \n" "Language-Team: Português do Brasil \n" -"Language: \n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Valores de depuração suportados:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Valores especiais de depuração:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Habilita todas as opções de depuração não comportamentais" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Variáveis de ambiente adicionais:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "" "Lista separada por vírgula contendo extensões de GL para fingir estarem " "desabilitadas" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "" "Sobrescrever a versão de GL que o Cogl vai presumir que o driver suporta" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:237 msgid "Cogl debugging flags to set" msgstr "Opções de depuração do Cogl a serem ativadas" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:239 msgid "Cogl debugging flags to unset" msgstr "Opções de depuração do Cogl a serem desativadas" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:288 msgid "Cogl Options" msgstr "Opções do Cogl" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:289 msgid "Show Cogl options" msgstr "Mostrar opções do Cogl" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Rastreamento do Cogl" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "Referências de CoglObject" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Depurar problemas de contagem de referências para CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Rastrear fatiamento de texturas" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "depurar a criação de fatiamentos de textura" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Rastrear texturas atlas" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Gerenciamento de depuração de texturas atlas" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Rastrear mesclagem de Strings" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Análise de depuração do CoglBlendString" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Rastrear diário" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Visualize toda a geometria que passa através do diário" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Rastrear o processamento de lotes" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Mostra como a geometria está sendo processada no diário" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Rastrear matrizes" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Rastrear toda manipulação de matrizes" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Rastrear miscelânea de desenho" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Rastreia algumas operações variadas de desenho" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Rastrear renderizador Pango" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Rastrear o renderizador Pango do Cogl" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Rastrear a retaguarda (backend) CoglTexturePixmap" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Rastreia a retaguarda (backend) da textura pixmap do Cogl" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Visualizar" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Contornar retângulos" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Adiciona contornos de linha para toda a geometria retângular" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Mostrar quadro de arame" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Adiciona contornos de linha para toda a geometria" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Causa raíz" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Desabilitar o processamento em lote do diário" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Desabilita o processamento em lote de geometria no diário Cogl." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Desabilitar os buffers de vértices GL" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Desabilita a utilização de objetos de buffers de vértices do OpenGL" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Desabilitar os buffers de píxel GL" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Desabilita a utilização de objetos de buffers de píxels do OpenGL" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Desabilitar a transformada de reta por software" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Utiliza a GPU para a transformar geometria retângular" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Especialista Cogl" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Descarregar imagens atlas" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Descarrega alterações em texturas atlas para um arquivo de imagem" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Desabilitar texturas atlas" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Desabilita a utilização de texturas atlas" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "" "Desabilitar o compartilhamento de texturas atlas entre textos e imagens" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -251,53 +251,53 @@ "separada para cada atlas. Caso contrário, ele tentará compartilhar o atlas " "com imagens." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Desabilitar texturização" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Desativar texturização de quaisquer primitivas" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Desabilitar arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Desabilitar a utilização de programas de fragmento ARB" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Desabilitar fixado" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "" "Desabilita o uso da função fixa de linha de processamento da retaguarda " "(backend)" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Desabilitar GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Desabilitar uso do GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Desabilita a mistura (blending)" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Desabilitar a utilização de mistura (blending)" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Desabilitar texturas que não sejam elevadas ao quadrado (^2)" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -305,70 +305,70 @@ "Faz o Cogl acreditar que o driver GL não suporta texturas NPOT para que " "deste modo sejam criadas texturas fatiadas ou texturas com resíduos." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Desabilitar o recorte por software" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" "Desabilita as tentativas do Cogl em recortar alguns retângulos no software." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Exibir fonte" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Mostrar o código-fonte ARBfp/GLSL gerado" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Rastrear um pouco o OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Rastreia algumas chamadas selecionadas do OpenGL" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Rastrear suporte fora da tela (offscreen)" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Realiza depuração de suporte fora da tela (offscreen)" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Desabilitar cache de programas" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Desabilitar os caches de reserva para os programas arbfp e glsl" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Desabilitar a otimização de leitura de píxel" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Desabilita a otimização de leitura de 1 píxel para cenas simples de " "retângulos opacos." -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Rastrear recortes" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Registra informações sobre como Cogl está implementando recortes" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Rastrear problemas de performance" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Tenta ressaltar o uso não ótimo de Cogl." Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/pt.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/pt.gmo differ diff -Nru cogl-1.22.0/po/pt.po cogl-1.22.2/po/pt.po --- cogl-1.22.0/po/pt.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/pt.po 2016-02-23 12:06:45.000000000 +0000 @@ -8,7 +8,7 @@ "Project-Id-Version: 3.8\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"POT-Creation-Date: 2013-03-17 00:42+0000\n" "PO-Revision-Date: 2013-03-17 00:40+0000\n" "Last-Translator: Duarte Loreto \n" "Language-Team: Portuguese \n" @@ -17,226 +17,226 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Valores de depuração suportados:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Valores de depuração especiais:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Ativa todas as opções de depuração não-comportamentais" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Variáveis de ambiente adicionais:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "" "Lista separada por vírgulas de extensões GL para considerar desativadas" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "Redefinir a versão GL que o Cogl irá assumir que o controlador suporta" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:237 msgid "Cogl debugging flags to set" msgstr "Parâmetros de depuração Cogl a definir" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:239 msgid "Cogl debugging flags to unset" msgstr "Parâmetros de depuração Cogl a desativar" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:288 msgid "Cogl Options" msgstr "Opções Cogl" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:289 msgid "Show Cogl options" msgstr "Apresentar as opções do Cogl" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Acompanhamento Cogl" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "Referências CoglObject" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Depurar problemas de contagem de referências para CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Acompanhar Fatiamento de Texturas" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "Depurar a criação de fatias de texturas" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Acompanhar Texturas Atlas" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Depurar a gestão de texturas atlas" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Acompanhar Mistura de Expressões" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Depurar o processamento de CoglBlendString" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Diário de Acompanhamento" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Visualizar toda a geometria a passar pelo diário" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Acompanhar Lotes" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Apresentar como a geometria é loteada no diário" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Acompanhar matrizes" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Acompanhar todas as manipulações de matrizes" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Acompanhar Miscelânea de Desenhos" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Acompanhar algumas operações de desenhos" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Acompanhar Renderizador Pango" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Acompanhar o renderizador Pango do Cogl" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Acompanhar o motor de CoglTexturePixmap" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Acompanhar o motor de imagens de texturas do Cogl" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Visualizar" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Delimitar retângulos" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Adicionar delimitações a todas as geometrias retangulares" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Apresentar contornos" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Adicionar contornos para todas as geometrias" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Motivo Inicial" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Desativar Loteamento no Diário" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Desativar o loteamento da geometria no Diário Cogl." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Desativar Buffers GL Vertex" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Desativar a utilização de objetos de buffer vertex OpenGL" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Desativar Buffer de Pixels GL" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Desativar a utilização de objetos de buffer de pixels OpenGL" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Desativar a transformação de retângulos pela aplicação" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Utilizar o Processador Gráfico para transformar geometria retangular" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Especialista Cogl" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Despejar imagens atlas" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Despejar alterações de texturas atlas num ficheiro de imagem" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Desativar atlas de texturas" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Desativar a utilização de atlas de texturas" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "Desativar a partilha de texturas atlas entre texto e imagens" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -244,51 +244,51 @@ "Quando definido, a cache de glifos irá utilizar sempre uma textura separada " "para o seu atlas. Caso contrário, tentará partilhar o atlas com as imagens." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Desativar texturas" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Desativar texturas de quaisquer primitivas" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Desativar arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Desativar a utilização de aplicações de fragmentos ARB" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Desativar fixa" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Desativar a utilização do motor de canal de função fixa" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Desativar GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Desativar a utilização do GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Desativar mistura" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Desativar a utilização de mistura" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Desativar texturas que não sejam potência-de-dois" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -296,69 +296,69 @@ "Faz o Cogl pensar que o controlador GL não suporta texturas Potência-de-dois " "pelo que irá criar texturas fatiadas ou texturas com desperdício." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Desativar corte por aplicação" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "Desativa a tentativa do Cogl de cortar na aplicação alguns retângulos." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Apresentar fonte" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Apresenta o código fonte ARBfp/GLSL gerado" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Acompanhar algum OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Acompanha algumas chamadas OpenGL selecionadas" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Acompanhar suporte fora do ecrã" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Depurar suporte fora do ecrã" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Desativar caches da aplicação" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Desativar caches de recurso para aplicações arbfp e glsl" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Desativar otimização de pixel lido" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Desativar a otimização para leitura de 1px de cenas simples de retângulos " "opacos" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Acompanhar corte" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Regista informação sobre como o Cogl está a implementar o corte" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Acompanhar problemas de desempenho" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Tenta realçar utilização subótima do Cogl." Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/ru.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/ru.gmo differ diff -Nru cogl-1.22.0/po/Rules-quot cogl-1.22.2/po/Rules-quot --- cogl-1.22.0/po/Rules-quot 2013-09-22 17:15:55.000000000 +0000 +++ cogl-1.22.2/po/Rules-quot 2016-08-26 17:33:38.000000000 +0000 @@ -1,3 +1,4 @@ +# This file, Rules-quot, can be copied and used freely without restrictions. # Special Makefile rules for English message catalogs with quotation marks. DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot @@ -14,13 +15,23 @@ .insert-header.po-update-en: @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \ - if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ + if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ tmpdir=`pwd`; \ echo "$$lang:"; \ ll=`echo $$lang | sed -e 's/@.*//'`; \ LC_ALL=C; export LC_ALL; \ cd $(srcdir); \ - if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ + if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \ + | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \ + { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \ + $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \ + ;; \ + *) \ + $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \ + ;; \ + esac } 2>/dev/null > $$tmpdir/$$lang.new.po \ + ; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ diff -Nru cogl-1.22.0/po/ru.po cogl-1.22.2/po/ru.po --- cogl-1.22.0/po/ru.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/ru.po 2016-02-23 12:06:45.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-08-01 10:44+0000\n" "PO-Revision-Date: 2012-09-23 20:09+0400\n" "Last-Translator: Yuri Myasoedov \n" "Language-Team: русский \n" @@ -22,225 +22,209 @@ "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" "X-Generator: Lokalize 1.0\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Поддерживаемые значения отладки:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Специальные значения отладки:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Включить все внеповеденческие параметры отладки" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Дополнительные переменные окружения:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "Список отключённых расширений GL, разделённый запятыми" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "Переопределить версию GL, для которой Cogl имеет поддержку драйвера" -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "Отладочные флаги Cogl для установки" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "Отладочные флаги Cogl для сброса" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "Параметры Cogl" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "Показать параметры Cogl" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Трассировка Cogl" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "Ссылки CoglObject" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Отладить подсчёт ссылок CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Трассировка нарезки текстур" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "отладка создания слоёв текстур" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Трассировка атласа текстур" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Отладка управления атласом текстур" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Трассировка смешанных строк" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Отладка разбора CoglBlendString" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Журнал трассировки" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Показывать все фигуры, передаваемую через журнал" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Трассировка комплектации" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Показывать как фигуры комплектуется в журнале" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Трассировка матриц" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Трассировать все операции с матрицами" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Трассировка различных рисований" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Трассировать некоторые другие операции рисования" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Трассировка визуализатора Pango" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Трассировать визуализатор Cogl Pango" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Трассировка обработчик CoglTexturePixmap" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Трассировать обработчик точечных карт текстур Cogl" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Визуализировать" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Очертить прямоугольниками" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Добавить контуры для всех прямоугольных фигур" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Показать контуры" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Добавить контуры для всех фигур" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Коренная причина" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Отключить журнал комплектации" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Отключить комплектацию фигур в журнале Cogl." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Выключить буферы GL Vertex" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Запретить использование вершинных буферных объектов OpenGL" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Выключить буферы GL Pixel" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Запретить использование пиксельных буферных объектов OpenGL" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Выключить программное преобразование прямоугольных координат" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Использовать GPU для преобразований прямоугольных координат" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Специалист Cogl" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Дамп атласа изображений" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Записать дамп изменений атласа текстур в файл изображений" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Выключить атлас текстур" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Не использовать атлас текстур" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "Выключить общий атлас текстур между текстом и изображениями" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -248,51 +232,51 @@ "При определении кэша глифов всегда использовать отдельную текстуру для этого " "атласа. В противном случае попытаться использовать общий атлас изображений." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Выключить текстурирование" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Выключить текстурирование примитивов" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Выключить arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Не использовать ARB-фрагменты программ" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Выключить постоянный обработчик" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Не использовать постоянный функциональный конвейерный обработчик" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Выключить GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Не использовать GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Отключить смешивание" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Отключить использование смешивания" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Выключить текстуры не степени двойки" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -300,69 +284,81 @@ "Заставить Cogl думать, что драйвер GL не поддерживает текстуры NPOT для " "того, чтобы вместо них он создавал слоистые текстуры или избыточные текстуры." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Выключить программное усечение" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "Запретить Cogl пытаться усекать некоторые прямоугольники программно." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Показать исходный код" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Показать сгенерированный исходный код ARBfp/GLSL" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Частичная трассировка OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Трассировка некоторых выбранных вызовов OpenGL" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Трассировка закадровой поддержки" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Отладка закадровой поддержки" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Выключить программные кэши" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Выключить запасные кэши для программ arbfp и glsl" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Выключить оптимизацию чтения пикселя" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Выключить оптимизацию для чтения 1px на простых сценах с непрозрачными " "прямоугольниками" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Трассировка усечения" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Протоколировать информацию о том, как Cogl реализует усечение" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Трассировка проблем с производительностью" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Пытается выделить неоптимальное использование Cogl." + +#~ msgid "Cogl debugging flags to set" +#~ msgstr "Отладочные флаги Cogl для установки" + +#~ msgid "Cogl debugging flags to unset" +#~ msgstr "Отладочные флаги Cogl для сброса" + +#~ msgid "Cogl Options" +#~ msgstr "Параметры Cogl" + +#~ msgid "Show Cogl options" +#~ msgstr "Показать параметры Cogl" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/sk.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/sk.gmo differ diff -Nru cogl-1.22.0/po/sk.po cogl-1.22.2/po/sk.po --- cogl-1.22.0/po/sk.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/sk.po 2016-02-23 12:06:45.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: cogl cogl-1.14\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-03-22 19:31+0000\n" "PO-Revision-Date: 2013-03-24 10:53+0100\n" "Last-Translator: Ján Kyselica \n" "Language-Team: Slovak \n" @@ -19,284 +19,284 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" "X-Generator: Poedit 1.5.4\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Podporované ladiace hodnoty:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Špeciálne ladiace hodnoty:" # popis prepínača -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Povolí všetky ladiace voľby, ktoré sa netýkajú správania" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Dodatočné premenné prostredia:" # popis premennej prostredia -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "" "Čiarkami oddelený zoznam rozšírení GL, pri ktorých sa má predstierať, že sú " "zakázané" # popis premennej prostredia -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "" "Prepíše na verziu GL, o ktorej Cogl predpokladá, že je podporovaná ovládačom" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:237 msgid "Cogl debugging flags to set" msgstr "Nastaviť ladiace značky rozhrania Cogl" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:239 msgid "Cogl debugging flags to unset" msgstr "Zrušiť nastavenie ladiacich značiek rozhrania Cogl" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:288 msgid "Cogl Options" msgstr "Voľby pre Cogl" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:289 msgid "Show Cogl options" msgstr "Zobrazí voľby pre Cogl" # názov skupiny ladiacich hodnôt -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Trasovanie rozhrania Cogl" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "Odkazy na CoglObject" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Ladí problémy s počítaním odkazov na CoglObjects" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Sledovať delenie textúry" # PM: prečo je to malým písmenom ked všetky ostatné reťazce sú veľkým, nahlás bug # JK: https://bugzilla.gnome.org/show_bug.cgi?id=695237 # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "ladí tvorbu častí textúry" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Sledovať atlas textúr" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Ladí správu atlasu textúr" # PM: skôr zmiešanie, prelnutie - inde si použil miešanie # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Sledovať miešanie reťazcov" # PM: je to popis môžeme byť obšírnejší, syntaktickú analýzu # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Ladí syntaktickú analýzu CoglBlendString" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Sledovať žurnál" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Zobrazí všetky geometrické tvary prechádzajúce cez žurnál" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Sledovať dávkové spracovanie" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Zobrazí ako sú geometrické tvary dávkovo spracovávané v žurnále" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Sledovať matice" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Sleduje celú manipuláciu s maticami" # formátovaný názov ladiacej hodnoty # /* XXX we should replace the "draw" option its very hand wavy... */ -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Sledovať kreslenie rôznymi štýlmi" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Sleduje niektoré operácie kreslenia rôznymi štýlmi" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Sledovať vykreslovanie knižnicou Pango" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Sleduje vykreslovanie knižnicou Pango v rozhraní Cogl" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Sledovať obslužný program CoglTexturePixmap" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Sleduje obslužný program pixmapových textúr Cogl" # názov skupiny ladiacich hodnôt -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Vizualizácia" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Obrysy obdĺžnikov" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Pridá obrysy pre všetky obdĺžnikové tvary" # PK: wireframe neni oramovanie # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Zobraziť drôtový model" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Pridá drôtový model pre všetky geometrické tvary" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Základné veci" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Zakázať dávkové spracovanie v žurnále" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "" "Zakáže dávkové spracovanie geometrických tvarov v žurnále rozhrania Cogl." # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Zakázať vyrovnávacie pamäte pre vrcholy v GL" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Zakáže používanie vyrovnávacej pamäte pre vertexy objektov v OpenGL" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Zakázať vyrovnávacie pamäte pre pixely v GL" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Zakáže používanie vyrovnávacej pamäte pre pixely objektov v OpenGL" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Zakázať softvérovú transformáciu obdĺžnikov" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Použije grafický procesor na transformáciu obdĺžnikových tvarov" # názov skupiny ladiacich hodnôt -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Odborné veci" # MČ: Uložiť mi evokuje, že som si pripravil nejaké údaje a chcem ich uchovať. Dump má podľa mňa význam „odložiť si nejaký polotovar, ktorý vznikol počas práce programu“, takže by som možno bol za preklad „odložiť“, ale nechám na zváženie. # PM: chápem to ako uloženie atlasu vo forme obrázka kvôli ladeniu odložiť sa mi sem nehodí # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Uložiť atlas obrázkov" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Uloží zmeny atlasu textúr do obrázkového súboru" # formátovaný názov ladiacej hodnotydump -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Zakázať tvorbu atlasu z textúr" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Zakáže vytváranie atlasu z textúr" # PK: sharing je zevraj nespisovne, nemam tusenie ako to prelozit inak # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "" "Zakázať spoločné používanie atlasu textúr v texte a zároveň aj v obrázkoch." # PM: zdá sa mi že originál hovorí niečo iné ako preklad. # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -305,64 +305,64 @@ "atlasu. V opačnom prípade sa pokúsi zdieľať atlas spolu s obrázkami." # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Zakázať textúrovanie" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Zakáže textúrovanie všetkých jednoduchých tvarov" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Zakázať arbfp" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Zakáže používanie fragmentovacích programov ARB" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Zakázať fixné" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Zakáže používanie zreťazenia fixných funkcií obslužného programu" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Zakázať GLSL" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Zakáže používanie GLSL" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Zakázať miešanie" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Zakáže používanie miešania" # PK: preco nie textury co nejsu mocninou 2 # formátovaný názov ladiacej hodnoty # JK: v nasledujucom retazci je pouzita skratka NPOT, preklad moze byt matuci -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Zakázať textúry, ktoré nie sú mocninou dvojky (NPOT)" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -371,62 +371,62 @@ "Textúry sa buď rozdelia na časti alebo bude vznikať prázdny priestor." # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Zakázať softvérové orezávanie" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "Zakáže pokusy o softvérové orezanie niektorých obdĺžnikových tvarov." # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Zobraziť zdrojový kód" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Zobrazí vygenerovaný zdrojový kód ARBfp/GLSL" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Sledovať OpenGL" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Sledovanie volaní vybraných funkcií OpenGL" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Sledovať podporu mimoobrazovkového vykreslovania" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Ladí podporu mimoobrazovkového vykreslovania" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Zakázať programom používanie vyrovnávacej pamäte" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Zakáže núdzové vyrovnávacie pamäte pre programy arbfp a glsl" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Zakázať optimalizáciu čítania pixelov" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" @@ -434,17 +434,17 @@ "po 1 pixeli" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Sledovať orezávanie" # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Zapisuje informácie o spôsobe akým Cogl implementuje orezávanie" # formátovaný názov ladiacej hodnoty -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Sledovať aspekty výkonnosti" @@ -455,6 +455,6 @@ # MČ: pokiaľ mám správne informácie, tak slovo „optimálne“ má takú hlúpu vlastnosť, že sa nedá stupňovať a predstavuje najvyšší stupeň. Teda menej optimálne je z tohto pohľadu nezmysel. Takže niečo je optimálne, alebo nie je optimálne. Suboptimálne sa dá teda preložiť ako horšie ako optimálne, ale nie o mnoho. # PM: čiže takmer optimálne # popis (description) ladiacej hodnoty -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Pokúsi sa zvýrazniť takmer optimálne použitie rozhrania Cogl." Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/sl.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/sl.gmo differ diff -Nru cogl-1.22.0/po/sl.po cogl-1.22.2/po/sl.po --- cogl-1.22.0/po/sl.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/sl.po 2016-08-26 16:18:04.000000000 +0000 @@ -9,363 +9,362 @@ msgid "" msgstr "" "Project-Id-Version: cogl master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-08-07 05:19+0000\n" "PO-Revision-Date: 2012-08-07 09:19+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" -"Language: \n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" -"%100==4 ? 3 : 0);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n" "X-Poedit-Country: SLOVENIA\n" "X-Poedit-Language: Slovenian\n" "X-Poedit-SourceCharset: utf-8\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Podprta določila razhroščevanja:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Posebna določila razhroščevanja:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Omogoči vse ne-prikazne možnosti razhroščevanja" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Dodatne okoljske spremenljivke:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "Z vejico ločen seznam razširitev GL, ki naj bi bile onemogočene" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "Prepiši različico GL, za katero je predvidena podpora gonilnikov" -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "Zastavice razhroščevanja Cogl za nastavljanje" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "Zastavice razhroščevanja Cogl za odstranitev" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "Možnosti Cogl" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "Pokaži možnosti Cogl" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 +#: ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 +#: ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 +#: ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Sledenje Cogl" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "Sklici predmetov CoglObject" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Razhroščevanje sklicev števca napak predmetov CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Sledi porezavi tekstur" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "razhroščevanje ustvarjanja porezav teksture" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Sledi teksturam nabora" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Razhroščevanje upravljanja nabora tekstur" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Sledi nizom zlivanja" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Razhroščevanje razčlenitev CoglBlendString" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Sledi dnevniku" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Preglej celotno geometrijo predmetov, ki se beležijo v dnevnik" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Sledi paketni obdelavi" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Pokaži paketno obdelavo geometrije predmetov v dnevniku" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Sledi matrikam" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Sledi vsem obdelavam matrik" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Sledi risanju" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Sledi nekaterim risarskim opravilom" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Sledi izrisovalniku Pango" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Sledi izrisovalniku Cogl Pango" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Sledi zaledju CoglTexturePixmap" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Sledi zaledju sličic teksture Cogl" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Predoči" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Oriši pravokotnike" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Dodaj črtni oris geometriji risanim pravokotnim predmetom" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Pokaži črtne orise" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Dodaj črtni oris vsem risanim predmetom" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 +#: ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 +#: ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Korenski vzrok" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Onemogoči paketno obdelavo dnevnika" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Onemogoči paketno obdelovanje geometrije v dnevniku Cogl." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Onemogoči medpomnilnik točk GL" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Onemogoči uporabo točkovnega medpomnilnika predmetov OpenGL" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Onemogoči medpomnilnik sličic GL" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Onemogoči uporabo medpomnilnika sličic predmetov OpenGL" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Onemogoči programsko preoblikovanje pravokotnikov" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Uporabi GPE za preoblikovanje geometrije pravokotnih predmetov" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Specialist Cogl" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Izriši slike nabora tekstur" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Izriši spremembe nabora tekstur v slikovno datoteko" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Onemogoči zbiranje nabora tekstur" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Onemogoči uporabo zbiranja nabora tekstur" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "Onemogoči souporabo nabora tekstur med besedilom in slikami" -#: cogl/cogl-debug-options.h:126 -msgid "" -"When this is set the glyph cache will always use a separate texture for its " -"atlas. Otherwise it will try to share the atlas with images." -msgstr "" -"Izbrana možnost omogoča uporabo predpomnjenja pismenk v ločenem naboru " -"tekstur. Sicer bo nabor souporabljen med pismenkami in slikami." +#: ../cogl/cogl-debug-options.h:119 +msgid "When this is set the glyph cache will always use a separate texture for its atlas. Otherwise it will try to share the atlas with images." +msgstr "Izbrana možnost omogoča uporabo predpomnjenja pismenk v ločenem naboru tekstur. Sicer bo nabor souporabljen med pismenkami in slikami." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Onemogoči sestavljanje nabora" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Onemogoči teksturiranje primitivov" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Onemogoči arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Onemogoči uporabo fragmentarnih programov ARB" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Onemogoči določeno" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Onemogoči uporabo zaledja stalnih funkcij cevovoda" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Onemogoči GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Onemogoči uporabo GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Onemogoči zlivanje" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Onemogoči uporabo zlivanja" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Onemogoči nekvadratne teksture" -#: cogl/cogl-debug-options.h:157 -msgid "" -"Makes Cogl think that the GL driver doesn't support NPOT textures so that it " -"will create sliced textures or textures with waste instead." -msgstr "" -"Vsili nastavitev, da gonilnik GL ne podpira tekstur NPOT in bo zato program " -"Cogl ustvaril razrezane teksture." +#: ../cogl/cogl-debug-options.h:150 +msgid "Makes Cogl think that the GL driver doesn't support NPOT textures so that it will create sliced textures or textures with waste instead." +msgstr "Vsili nastavitev, da gonilnik GL ne podpira tekstur NPOT in bo zato program Cogl ustvaril razrezane teksture." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Onemogoči programski odrez" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "Onemogoči poskuse Cogl, da odreže nekatere pravokotnike v programju." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Prikaži vir" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Pokaži ustvarjeno izvorno kodo ARBfp/GLSL" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Sledi delovanju OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Sledi nekaterim izbranim klicem OpenGL" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Sledi podpori zunaj zaslona" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Razhroščevanje podpore zunaj zaslona" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Onemogoči predpomnilnike programa" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Onemogoči zasilne predpomnilnike za programe arbfp in glsl" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Onemogoči prilagajanje branja sličic" -#: cogl/cogl-debug-options.h:188 -msgid "" -"Disable optimization for reading 1px for simple scenes of opaque rectangles" -msgstr "" -"Onemogoči prilagajanje branja ene slikovne točke za enostavne prizore s " -"prekrivnimi pravokotniki" +#: ../cogl/cogl-debug-options.h:181 +msgid "Disable optimization for reading 1px for simple scenes of opaque rectangles" +msgstr "Onemogoči prilagajanje branja ene slikovne točke za enostavne prizore s prekrivnimi pravokotniki" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Sledi odrezovanju" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Beleži podatke podrobnosti o izvajanju odrezovanja s programom Cogl" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Opombe k zaznavi izvajanja" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Poskus poudarjanja ne-optimalne uporabe sistema Cogl." + +#~ msgid "Cogl debugging flags to set" +#~ msgstr "Zastavice razhroščevanja Cogl za nastavljanje" + +#~ msgid "Cogl debugging flags to unset" +#~ msgstr "Zastavice razhroščevanja Cogl za odstranitev" + +#~ msgid "Cogl Options" +#~ msgstr "Možnosti Cogl" + +#~ msgid "Show Cogl options" +#~ msgstr "Pokaži možnosti Cogl" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/sr.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/sr.gmo differ Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/sr@latin.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/sr@latin.gmo differ diff -Nru cogl-1.22.0/po/sr@latin.po cogl-1.22.2/po/sr@latin.po --- cogl-1.22.0/po/sr@latin.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/sr@latin.po 2016-08-26 16:18:04.000000000 +0000 @@ -5,241 +5,241 @@ msgid "" msgstr "" "Project-Id-Version: cogl master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=cogl&k" +"eywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-09-25 23:19+0000\n" "PO-Revision-Date: 2012-09-27 05:41+0200\n" "Last-Translator: Miroslav Nikolić \n" "Language-Team: Serbian \n" -"Language: sr\n" +"Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n" -"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : " +"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Project-Style: gnome\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Podržane vrednosti pročišćavanja:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Posebne vrednosti pročišćavanja:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Uključuje sve ne-ponašajuće opcije pročišćavanja" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Dodatne promenljive okruženja:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "Zarezom razdvojen spisak GL proširenja koja su isključena" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "" "Prevazilazi GL izdanje za koje će Kogl smatrati da ga podržavaju upravljački " "programi" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:237 msgid "Cogl debugging flags to set" msgstr "Koglove opcije pročišćavanja za postavljanje" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:239 msgid "Cogl debugging flags to unset" msgstr "Koglove opcije pročišćavanja za uklanjanje" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:288 msgid "Cogl Options" msgstr "Opcije Kogla" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:289 msgid "Show Cogl options" msgstr "Prikazuje opcije Kogla" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Koglovo praćenje" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "Reference objekta Kogla" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Pročišćava probleme brojanja referenci za objekte Kogla" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Prati isecanje sklopa" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "Pročišćava stvaranje isečaka sklopa" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Prati sklopove atlasa" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Pročišćava upravljanje atlasom sklopa" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Prati niske stapanja" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Pročišćava obrađivanje niski stapanja Kogla" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Prati rukavac" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Pregleda sve oblike koji prolaze kroz rukavac" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Prati grupisanje" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Prikazuje kako oblik biva grupisan u rukavcu" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Prati matrice" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Prati sva rukovanja matricom" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Prati mešano crtanje" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Prati neke radnje mešanog crtanja" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Prati Pango iscrtavača" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Prati Kogl Pango iscrtavača" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Prati pozadinca mape tačaka sklopa Kogla" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Prati pozadinca mape tačaka sklopa Kogla" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Obvidni" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Pravougaonici konture" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Dodaje žičane konture za sve pravougaone oblike" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Prikazuje žičane ramove" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Dodaje žičane konture za sve oblike" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Koreni uzrok" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Isključi grupisanje rukavca" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Isključuje grupisanje oblika u rukavcu Kogla." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Isključi međumemorije vrhunca GL-a" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Isključuje korišćenje objekata međumemorije vrhunca OpenGL-a" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Isključi međumemorije tačke GL-a" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Isključuje korišćenje objekata međumemorije tačke OpenGL-a" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Isključi softversko preobražavanje pravougaonika" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Koristi grafički procesor za preobražavanje pravougaonog oblika" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Specijalista Kogla" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Uskladišti slike atlasa" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Skladišti izmene atlasa sklopa u datoteku slike" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Isključi atlasiranje sklopa" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Isključuje upotrebu atlasiranja sklopa" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "Isključi deljenje atlasa sklopa između teksta i slika" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -247,51 +247,51 @@ "Kada je ovo podešeno ostava simbola će uvek koristiti odvojene sklopove za " "svoj atlas. U suprotnom će pokušati da deli atlas sa slikama." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Isključi prikaz sklopa" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Isključuje prikaz sklopa bilo koje osnovne funkcije" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Isključi arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Isključuje upotrebu programa ARB odlomaka" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Isključi stalnu" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Isključuje upotrebu pozadinca spojke stalne funkcije" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Isključi GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Isključuje upotrebu GLSL-a" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Isključi stapanje" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Isključuje upotrebu stapanja" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Isključi sklopove koji nisu stepen dvojke" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -299,69 +299,69 @@ "Čini da Kogl misli da GL upravljački program ne podržava NPOT sklopove tako " "da će napraviti iseckane sklopove ili sklopove sa rasipanjem umesto toga." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Isključi softversko odsecanje" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "Isključuje Koglove pokušaje da odseče neke pravougaonike u softveru." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Prikaži izvor" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Prikazuje stvoreni ARBfp/GLSL izvorni kod" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Prati neki OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Prati neke odabrane pozive OpenGL-a" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Prati vanekransku podršku" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Pročisti vanekransku podršku" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Isključi ostave programa" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Isključuje ostave prebacivanja za arbfp i glsl programe" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Isključi optimizaciju čitanja tačke" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Isključuje optimizaciju za čitanje 1 tačke za jednostavne scene neprozirnih " "pravougaonika" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Prati odsecanje" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Zapisuje podatke o tome kako Kogl primenjuje odsecanje" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Prati udele učinka" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Pokušava da istakne podoptimalno korišćenje Kogla." diff -Nru cogl-1.22.0/po/sr.po cogl-1.22.2/po/sr.po --- cogl-1.22.0/po/sr.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/sr.po 2016-02-23 12:06:45.000000000 +0000 @@ -5,9 +5,9 @@ msgid "" msgstr "" "Project-Id-Version: cogl master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=cogl&k" +"eywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-09-25 23:19+0000\n" "PO-Revision-Date: 2012-09-27 05:41+0200\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian \n" @@ -15,231 +15,231 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n" -"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : " +"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Project-Style: gnome\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Подржане вредности прочишћавања:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Посебне вредности прочишћавања:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Укључује све не-понашајуће опције прочишћавања" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Додатне променљиве окружења:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "Зарезом раздвојен списак ГЛ проширења која су искључена" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "" "Превазилази ГЛ издање за које ће Когл сматрати да га подржавају управљачки " "програми" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:237 msgid "Cogl debugging flags to set" msgstr "Коглове опције прочишћавања за постављање" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:239 msgid "Cogl debugging flags to unset" msgstr "Коглове опције прочишћавања за уклањање" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:288 msgid "Cogl Options" msgstr "Опције Когла" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:289 msgid "Show Cogl options" msgstr "Приказује опције Когла" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Коглово праћење" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "Референце објекта Когла" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Прочишћава проблеме бројања референци за објекте Когла" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Прати исецање склопа" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "Прочишћава стварање исечака склопа" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Прати склопове атласа" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Прочишћава управљање атласом склопа" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Прати ниске стапања" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Прочишћава обрађивање ниски стапања Когла" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Прати рукавац" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Прегледа све облике који пролазе кроз рукавац" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Прати груписање" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Приказује како облик бива груписан у рукавцу" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Прати матрице" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Прати сва руковања матрицом" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Прати мешано цртање" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Прати неке радње мешаног цртања" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Прати Панго исцртавача" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Прати Когл Панго исцртавача" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Прати позадинца мапе тачака склопа Когла" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Прати позадинца мапе тачака склопа Когла" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Обвидни" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Правоугаоници контуре" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Додаје жичане контуре за све правоугаоне облике" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Приказује жичане рамове" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Додаје жичане контуре за све облике" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Корени узрок" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Искључи груписање рукавца" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Искључује груписање облика у рукавцу Когла." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Искључи међумеморије врхунца ГЛ-а" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Искључује коришћење објеката међумеморије врхунца ОпенГЛ-а" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Искључи међумеморије тачке ГЛ-а" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Искључује коришћење објеката међумеморије тачке ОпенГЛ-а" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Искључи софтверско преображавање правоугаоника" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Користи графички процесор за преображавање правоугаоног облика" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Специјалиста Когла" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Ускладишти слике атласа" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Складишти измене атласа склопа у датотеку слике" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Искључи атласирање склопа" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Искључује употребу атласирања склопа" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "Искључи дељење атласа склопа између текста и слика" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -247,51 +247,51 @@ "Када је ово подешено остава симбола ће увек користити одвојене склопове за " "свој атлас. У супротном ће покушати да дели атлас са сликама." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Искључи приказ склопа" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Искључује приказ склопа било које основне функције" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Искључи арбфп" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Искључује употребу програма АРБ одломака" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Искључи сталну" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Искључује употребу позадинца спојке сталне функције" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Искључи ГЛСЛ" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Искључује употребу ГЛСЛ-а" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Искључи стапање" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Искључује употребу стапања" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Искључи склопове који нису степен двојке" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -299,69 +299,69 @@ "Чини да Когл мисли да ГЛ управљачки програм не подржава НПОТ склопове тако " "да ће направити исецкане склопове или склопове са расипањем уместо тога." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Искључи софтверско одсецање" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "Искључује Коглове покушаје да одсече неке правоугаонике у софтверу." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Прикажи извор" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Приказује створени АРБфп/ГЛСЛ изворни код" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Прати неки ОпенГЛ" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Прати неке одабране позиве ОпенГЛ-а" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Прати ванекранску подршку" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Прочисти ванекранску подршку" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Искључи оставе програма" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Искључује оставе пребацивања за арбфп и глсл програме" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Искључи оптимизацију читања тачке" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Искључује оптимизацију за читање 1 тачке за једноставне сцене непрозирних " "правоугаоника" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Прати одсецање" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Записује податке о томе како Когл примењује одсецање" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Прати уделе учинка" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Покушава да истакне подоптимално коришћење Когла." Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/sv.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/sv.gmo differ diff -Nru cogl-1.22.0/po/sv.po cogl-1.22.2/po/sv.po --- cogl-1.22.0/po/sv.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/sv.po 2016-02-23 12:06:45.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: cogl\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2014-09-18 15:07+0000\n" "PO-Revision-Date: 2014-09-19 00:06+0100\n" "Last-Translator: Sebastian Rasmussen \n" "Language-Team: Swedish \n" @@ -20,225 +20,225 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.5.4\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:181 msgid "Supported debug values:" msgstr "Felsökningsvärden som stöds:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:186 msgid "Special debug values:" msgstr "Speciella felsökningsvärden:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:188 ../cogl/cogl-debug.c:190 msgid "Enables all non-behavioural debug options" msgstr "Aktiverar alla icke-beteendemässiga felsökningsflaggor" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:197 msgid "Additional environment variables:" msgstr "Extra miljövariabler:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:198 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "Kommaseparerad lista av GL-tillägg som låtsas vara inaktiverade" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:200 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "Åsidosätt GL-versionen som Cogl antar att drivrutinen stöder" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:244 msgid "Cogl debugging flags to set" msgstr "Felsökningsflaggor för Cogl att ställa in" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:246 msgid "Cogl debugging flags to unset" msgstr "Felsökningsflaggor för Cogl att ta bort" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:295 msgid "Cogl Options" msgstr "Flaggor för Cogl" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:296 msgid "Show Cogl options" msgstr "Visa flaggor för Cogl" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:32 ../cogl/cogl-debug-options.h:37 +#: ../cogl/cogl-debug-options.h:42 ../cogl/cogl-debug-options.h:47 +#: ../cogl/cogl-debug-options.h:52 ../cogl/cogl-debug-options.h:57 +#: ../cogl/cogl-debug-options.h:62 ../cogl/cogl-debug-options.h:68 +#: ../cogl/cogl-debug-options.h:73 ../cogl/cogl-debug-options.h:78 +#: ../cogl/cogl-debug-options.h:165 ../cogl/cogl-debug-options.h:170 +#: ../cogl/cogl-debug-options.h:175 ../cogl/cogl-debug-options.h:191 +#: ../cogl/cogl-debug-options.h:196 msgid "Cogl Tracing" msgstr "Cogl-spårning" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:34 msgid "CoglObject references" msgstr "CoglObjekt-referenser" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:35 msgid "Debug ref counting issues for CoglObjects" msgstr "Felsök referensräkningsfel för CoglObjekt" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:39 msgid "Trace Texture Slicing" msgstr "Spåra texturskivning" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:40 msgid "debug the creation of texture slices" msgstr "felsök skapande av texturskivor" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:44 msgid "Trace Atlas Textures" msgstr "Spåra atlastexturer" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:45 msgid "Debug texture atlas management" msgstr "Felsök texturatlashantering" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:49 msgid "Trace Blend Strings" msgstr "Spåra tonade strängar" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:50 msgid "Debug CoglBlendString parsing" msgstr "Felsök CoglBlendString-tolkning" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:54 msgid "Trace Journal" msgstr "Spåra journalen" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:55 msgid "View all the geometry passing through the journal" msgstr "Visa all geometri som passerar genom journalen" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:59 msgid "Trace Batching" msgstr "Spåra dosering" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:60 msgid "Show how geometry is being batched in the journal" msgstr "Visa hur geometri doseras i journalen" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace matrices" msgstr "Spåra matriser" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:65 msgid "Trace all matrix manipulation" msgstr "Spåra all matrismanipulering" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:70 msgid "Trace Misc Drawing" msgstr "Spåra diverse uppritning" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:71 msgid "Trace some misc drawing operations" msgstr "Spåra diverse ritoperationer" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:75 msgid "Trace Pango Renderer" msgstr "Spåra Pango-renderare" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:76 msgid "Trace the Cogl Pango renderer" msgstr "Spåra Cogls Pango-renderare" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:80 msgid "Trace CoglTexturePixmap backend" msgstr "Spåra CoglTexturePixmap-bakände" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:81 msgid "Trace the Cogl texture pixmap backend" msgstr "Spåra Cogls texturbildsbakände" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:83 ../cogl/cogl-debug-options.h:88 msgid "Visualize" msgstr "Visualisera" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:85 msgid "Outline rectangles" msgstr "Rama i rektanglar" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:86 msgid "Add wire outlines for all rectangular geometry" msgstr "Lägg till trådramar för all rektangulär geometri" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:90 msgid "Show wireframes" msgstr "Visa trådramar" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:91 msgid "Add wire outlines for all geometry" msgstr "Lägg till trådramar för all geometri" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:93 ../cogl/cogl-debug-options.h:98 +#: ../cogl/cogl-debug-options.h:103 ../cogl/cogl-debug-options.h:108 +#: ../cogl/cogl-debug-options.h:118 ../cogl/cogl-debug-options.h:123 +#: ../cogl/cogl-debug-options.h:129 ../cogl/cogl-debug-options.h:134 +#: ../cogl/cogl-debug-options.h:139 ../cogl/cogl-debug-options.h:144 +#: ../cogl/cogl-debug-options.h:149 ../cogl/cogl-debug-options.h:154 +#: ../cogl/cogl-debug-options.h:160 ../cogl/cogl-debug-options.h:180 +#: ../cogl/cogl-debug-options.h:185 msgid "Root Cause" msgstr "Grundorsak" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:95 msgid "Disable Journal batching" msgstr "Inaktivera journaldosering" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:96 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Inaktivera dosering av geometri i Cogl-journalen." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:100 msgid "Disable GL Vertex Buffers" msgstr "Inaktivera GL vertexbuffrar" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:101 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Inaktivera användning av OpenGL vertexbuffertobjekt" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:105 msgid "Disable GL Pixel Buffers" msgstr "Inaktivera GL pixelbuffrar" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:106 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Inaktivera användning av OpenGL pixelbuffertobjekt" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:110 msgid "Disable software rect transform" msgstr "Inaktivera mjukvarurektangeltransform" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:111 msgid "Use the GPU to transform rectangular geometry" msgstr "Använd grafikprocessorn för att transformera rektangulär geometri" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:113 msgid "Cogl Specialist" msgstr "Cogl-specialist" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:115 msgid "Dump atlas images" msgstr "Dumpa atlasbilder" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:116 msgid "Dump texture atlas changes to an image file" msgstr "Dumpa ändringar av texturatlas till en bildfil" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:120 msgid "Disable texture atlasing" msgstr "Inaktivera texturatlasning" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:121 msgid "Disable use of texture atlasing" msgstr "Inaktivera användning av texturatlasning" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable sharing the texture atlas between text and images" msgstr "Inaktivera delning av texturatlasen mellan text och bilder" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:126 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -247,53 +247,53 @@ "textur för dess atlas. Annars kommer den att försöka att dela atlasen med " "bilder." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:131 msgid "Disable texturing" msgstr "Inaktivera texturering" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:132 msgid "Disable texturing any primitives" msgstr "Inaktivera texturering av vilka primitiver som helst" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:136 msgid "Disable arbfp" msgstr "Inaktivera arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:137 msgid "Disable use of ARB fragment programs" msgstr "Inaktivera användning av ARB-fragment-program" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:141 msgid "Disable fixed" msgstr "Inaktivera fast" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:142 msgid "Disable use of the fixed function pipeline backend" msgstr "" "Inaktivera användning av den bakänden för den rörledningen med fasta " "funktioner" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:146 msgid "Disable GLSL" msgstr "Inaktivera GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:147 msgid "Disable use of GLSL" msgstr "Inaktivera användning av GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:151 msgid "Disable blending" msgstr "Inaktivera toning" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:152 msgid "Disable use of blending" msgstr "Inaktivera användning av toning" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:156 msgid "Disable non-power-of-two textures" msgstr "Inaktivera icke-två-potens-texturer" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:157 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -301,68 +301,68 @@ "Får Cogl att tro att GL-drivrutinen inte har stöd för NPOT-texturer så att " "den kommer att skapa skivade texturer eller texturer med slöseri istället." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:162 msgid "Disable software clipping" msgstr "Inaktivera mjukvaruklippning" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:163 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "Inaktivera Cogls försök att klippa vissa rektanglar i programvara." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:167 msgid "Show source" msgstr "Visa källkod" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:168 msgid "Show generated ARBfp/GLSL source code" msgstr "Visa genererad ARBfp/GLSL-källkod" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:172 msgid "Trace some OpenGL" msgstr "Spåra vissa delar av OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:173 msgid "Traces some select OpenGL calls" msgstr "Spårar vissa OpenGL-anrop" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:177 msgid "Trace offscreen support" msgstr "Spåra utanförskärmenstöd" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:178 msgid "Debug offscreen support" msgstr "Felsök utanförskärmenstöd" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:182 msgid "Disable program caches" msgstr "Inaktivera programcachar" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:183 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Inaktivera reservcachar för arbfp- och glsl-program" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:187 msgid "Disable read pixel optimization" msgstr "Inaktivera pixelläsningsoptimering" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:188 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Inaktivera optimering för läsning av 1px för enkla scener av opaka rektanglar" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:193 msgid "Trace clipping" msgstr "Spåra klippning" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:194 msgid "Logs information about how Cogl is implementing clipping" msgstr "Logga information om hur Cogl implementerar klippning" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:198 msgid "Trace performance concerns" msgstr "Spåra prestandaproblem" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:199 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Försöker att markera suboptimal Cogl-användning." Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/ta.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/ta.gmo differ diff -Nru cogl-1.22.0/po/ta.po cogl-1.22.2/po/ta.po --- cogl-1.22.0/po/ta.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/ta.po 2016-02-23 12:06:45.000000000 +0000 @@ -8,9 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: cogl master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=clutter\n" +"POT-Creation-Date: 2012-09-20 10:47+0530\n" "PO-Revision-Date: 2012-09-20 10:51+0530\n" "Last-Translator: Dr.T.Vasudevan \n" "Language-Team: Tamil \n" @@ -21,225 +20,211 @@ "X-Generator: Lokalize 1.1\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "ஆதரிக்கப்படும் வழுநீக்கல் மதிப்புகள்:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "சிறப்பு வழுநீக்கல் மதிப்புகள்:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "நடத்தை - அல்லாத பிற ஏல்லா வழுநீக்கல் விருப்பங்களையும் செயல்படுத்தும்" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "கூடுதல் சூழல் மாறிகள்:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "காண்பித்துக்கொள்ள வேண்டிய GL நீட்சிகளின் கமாவால் பிரித்த பட்டியல் முடக்கப்பட்டுள்ளது" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" -msgstr "இயக்ககம் ஆதரிக்கும் என Cogl அனுமானித்துக்கொள்ளும் GL பதிப்பை மீறி செயல்படுத்து" +msgstr "" +"இயக்ககம் ஆதரிக்கும் என Cogl அனுமானித்துக்கொள்ளும் GL பதிப்பை மீறி " +"செயல்படுத்து" -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "Cogl பிழைதிருத்துதல் கொடிகளை அமைக்கிறது" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "Cogl பிழைதிருத்துதல் கொடிகளை அமைத்தல்நீக்குகிறது" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "Cogl விருப்பங்கள்" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "Cogl விருப்பங்களை காட்டவும்" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Cogl தடமறிதல்" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "CoglObject குறிப்புகள்" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "CoglObjects க்கான குறிப்பு எண்ணிடல் சிக்கல்களை வழுநீக்கு" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "டெக்ஸ்ச்சர் ஸ்லைசிங்கை தடமறி" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "டெக்ஸ்ச்சர் ஸ்லைசஸின் உருவாக்கத்தை வழுநீக்கு" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "அட்லாஸ் டெக்ஸ்ச்சர்களைத் தடமறி" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "டெக்ஸ்ச்சர் அட்லாஸ் நிர்வாகத்தை வழுநீக்கு" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "கலப்பு சரங்களைத் தடமறி" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "CoglBlendString பாகுபடுத்தலை வழுநீக்கு" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "இதழைத் தடமறி" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "இதழின் வழியே கடந்து செல்லும் எல்லா வடிவங்களையும் காண்பி" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "தொகுப்பாக்கத்தைத் தடமறி" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "இதழில் வடிவம் எப்படி தொகுப்பாக்கம் செய்யப்படுகிறது எனக் காண்பி" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "அணிகளைத் தடமறி" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "எல்லா அணி கையாளுகைகளையும் தடமறி" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "மற்ற வரைபொருள்களைத் தடமறி" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "சில மற்ற வரைபொருள் செயல்பாடுகளைத் தடமறி" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "பேங்கோ ரென்டரரைத் தடமறி" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Cogl பேங்கோ ரென்டரரைத் தடமறி" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "CoglTexturePixmap பின்புல முறைமையைத் தடமறி" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "CoglTexturePixmap பின்புல டெக்ஸ்ச்சர் முறைமையைத் தடமறி" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "காட்சிப்படுத்து" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "வெளிவரை செவ்வகங்கள்" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "செவ்வக வடிவங்கள் அனைத்துக்கும் வயர் வெளிவரையைச் சேர்க்கவும்" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "வயர்ஃப்ரேம்களைக் காண்பி" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "வடிவங்கள் அனைத்துக்கும் வயர் வெளிவரையைச் சேர்க்கவும்" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "மூலக் காரணம்" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "இதழ் தொகுப்பாக்கத்தை முடக்கு" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Cogl இதழில் வடிவங்களைத் தொகுப்பாக்கம் செய்தலை முடக்கு." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "GL முனை தாங்கல்களை முடக்கு" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "OpenGL முனை தாங்கல் பொருள்களைப் பயன்படுத்துவதை முடக்கு" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "GL பிக்சல் தாங்கல்களை முடக்கு" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "OpenGL பிக்சல் தாங்கல் பொருள்களைப் பயன்படுத்துவதை முடக்கு" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "மென்பொருள் செவ்வக உருமாற்றத்தை முடக்கு" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "செவ்வக வடிவத்தை உருமாற்ற GPU வைப் பயன்படுத்து" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Cogl வல்லுநர்" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "அட்லாஸ் படங்களைத் திணி" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "டெக்ஸ்ச்சர் அட்லாஸ் மாற்றங்களை ஒரு படக் கோப்பில் திணி" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "டெக்ஸ்ச்சர் அட்லாசிங்கை முடக்கு" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "டெக்ஸ்ச்சர் அட்லாஸிங்கைப் பயன்படுத்துவதை முடக்கு" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "உரைக்கும் படங்களுக்கும் இடையே டெக்ஸ்ச்சர் அட்லாசைப் பகிர்ந்துகொள்ளுதலை முடக்கு" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -247,51 +232,51 @@ "இதை அமைத்திருந்தால், கிளிஃப் தேக்ககமானது அதன் அட்லாசுக்கு எப்போதும் தனியான ஒரு " "டெக்ஸ்ச்சரையே பயன்படுத்தும். இல்லாவிட்டால் அட்லாஸை படங்களுடன் பகிர்ந்துகொள்ள முயற்சிக்கும்." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "டெக்ஸ்ச்சரிங் செய்தலை முடக்கு" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "பண்பற்றதை டெக்ஸ்ச்சரிங் செய்தலை முடக்கு" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "arbfp ஐ முடக்கு" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "ARB துண்டு நிரல்களைப் பயன்படுத்துவதை முடக்கு" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "நிலையானவற்றை முடக்கு" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "நிலையான செயல்தொகுதி பைப்லைன் பின்புல முறைமையைப் பயன்படுத்துவதை முடக்கு" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "GLSL ஐ முடக்கு" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "GLSL பயன்பாட்டை முடக்கு" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "கலத்தலை முடக்கு" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "கலத்தலைப் பயன்படுத்துவதை முடக்கு" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "அடுக்கு இரன்டு என அல்லாத டெக்ஸ்ச்சர்களை முடக்கு" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -299,70 +284,80 @@ "GL இயக்ககங்கள் NPOT டெக்ஸ்ச்சர்களை ஆதரிக்காது, ஆகவே அது கூறிட்ட டெக்ஸ்ச்சர்கள் அல்லது வீணான " "டெக்ஸ்ச்சர்களை உருவாக்கும் என Cogl ஐ நினைத்துக்கொள்ளச் செய்யும்." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "மென்பொருள் கிளிப்பிங்கை முடக்கு" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." -msgstr "" -"மென்பொருளில் சில செவ்வகங்களைக் கிளிப் செய்ய Cogl எடுக்கும் முயற்சிகளை முடக்குகிறது." +msgstr "மென்பொருளில் சில செவ்வகங்களைக் கிளிப் செய்ய Cogl எடுக்கும் முயற்சிகளை முடக்குகிறது." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "மூலத்தைக் காண்பி" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "உருவாக்கப்பட்ட ARBfp/GLSL மூலக் குறியீட்டைக் காண்பி" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "சில OpenGL ஐத் தடமறி" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "தேர்ந்தெடுக்கப்பட்ட சில OpenGL அழைப்புகளைத் தடமறி" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "திரையிலல்லாத ஆதரவைத் தடமறி" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "திரையிலல்லாத ஆதரவை வழுநீக்கு" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "நிரல் தேக்ககங்களை முடக்கு" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "arbfp மற்றும் glsl நிரல்களுக்கு ஃபால்பேக் தேக்ககங்களை முடக்கு" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "பிக்சல் உகப்பாக்குதலைப் படித்தலை முடக்கு" -#: cogl/cogl-debug-options.h:188 -msgid "" -"Disable optimization for reading 1px for simple scenes of opaque rectangles" +#: ../cogl/cogl-debug-options.h:181 +msgid "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "ஒளி ஊடுருவக்கூடிய செவ்வகங்களின் எளிய காட்சிகளுக்கு 1px ஐ வாசிப்பதற்கான உகப்பாக்கலை " "முடக்கு" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "கிளிப்பிங்கைத் தடமறி" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Cogl எப்படி கிளிப்பிங்கை செயல்படுத்துகிறது என்ற தகவலைப் பதிவு செய்யும்" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "செயல்திறன் விவகாரங்களைத் தடமறி" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "உப-உகப்பாக்கல் Cogl பயன்பாட்டைத் தனிப்படுத்திக் காண்பிக்க முயற்சிக்கிறது." + +#~ msgid "Cogl debugging flags to set" +#~ msgstr "Cogl பிழைதிருத்துதல் கொடிகளை அமைக்கிறது" + +#~ msgid "Cogl debugging flags to unset" +#~ msgstr "Cogl பிழைதிருத்துதல் கொடிகளை அமைத்தல்நீக்குகிறது" + +#~ msgid "Cogl Options" +#~ msgstr "Cogl விருப்பங்கள்" + +#~ msgid "Show Cogl options" +#~ msgstr "Cogl விருப்பங்களை காட்டவும்" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/te.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/te.gmo differ diff -Nru cogl-1.22.0/po/te.po cogl-1.22.2/po/te.po --- cogl-1.22.0/po/te.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/te.po 2016-02-23 12:06:45.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-08-13 20:22+0000\n" "PO-Revision-Date: 2012-08-14 12:37+0530\n" "Last-Translator: Krishnababu Krothapalli \n" "Language-Team: Telugu \n" @@ -21,345 +21,347 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.4\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "తోడ్పాటునిచ్చు డీబగ్ విలువలు:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "ప్రత్యేక డీబగ్ విలువలు:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "అన్ని ప్రవర్తన-లేని డీబగ్ ఐచ్చికాలను చేతనంచేయును" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "అదనపు యెన్విరాన్మెంట్ వేరియబల్స్:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "అచేతనమైనవిగా నటించే GL విస్తరింపుల జాబితా" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "డ్రైవర్ తోడ్పాటునిస్తుందని Cogl అనుకొనే GL వర్షన్ వోవర్‌రైడ్ చేయి" -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "Cogl క్రమబద్దీకరించడానికి దోష నివారణ జెండాలు" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "Cogl క్రమరహిత పరచడానికి దోష నివారణ జెండాలు" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "Cogl ఇచ్ఛికాలు" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "Cogl ఇచ్ఛికాలను చూపుము" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Cogl జాడపట్టుట" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "CoglObject ప్రస్తావనలు" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "CoglObjects కొరకు డీబగ్ ప్రస్తావన లెక్కింపు సమస్యలు" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "టెక్చర్ స్లైసింగ్ జాడ పట్టు" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "టెక్చర్ స్లైసెస్ సృష్టీకరణ డీబగ్" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "అట్లాస్ టెక్చర్ జాడ పట్టు" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "టెక్చర్ అట్లాస్ నిర్వహణ డీబగ్ చేయి" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "బ్లెండ్ స్ట్రింగ్స్ జాడ పట్టు" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "CoglBlendString పదచ్ఛేదం(పార్శింగ్) డీబగ్ చేయి" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "జర్నల్ జాడ పట్టు" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "జర్నల్ ద్వారా మొత్తం జ్యామితి పదచ్ఛేదం(పార్శింగ్) దర్శించు" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "బాచింగ్ జాడ పట్టు" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "జర్నల్ నందు జ్యామితి యెలా బాచ్‌డ్ చేయబడెనో చూపు" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "జాడ పట్టు మాట్రిసెస్" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "మొత్తం మాట్రిక్స్ నడుపుదల జాడ పట్టు" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "మిస్క్ చిత్రీకరణ జాడ పట్టు" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "కొన్ని మిస్క్ చిత్రీకరణ కార్యములను జాడ పట్టు" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "పాంగో రెండరర్‌ను జాడ పట్టు" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Cogl పాంగో రెండరర్ జాడ పట్టు" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "CoglTexturePixmap బాకెండ్ జాడ పట్టు" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Cogl టెక్టర్ పిక్స్‌మాప్ బ్యాకెండ్ జాడ పట్టు" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "దృశ్యనీయం" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "ఆన్‌లైన్ దీర్ఘచతురస్త్రాలు" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "మొత్త దీర్ఘచతురస్త్ర జ్యామితికి వైర్ కట్టుగీతలు జతచేయి" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "వైర్‌చట్రములను చూపు" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "మొత్తం జ్యామితికి వైర్ కట్టుగీతలను జతచేయి" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "మూల కారణం" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "జర్నల్ బ్యాచింగ్ అచేతనంచేయి" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Cogl జర్నల్ నందు జ్యామితి బ్యాచింగ్ అచేతనంచేయి." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "GL వర్టెక్స్ బఫర్స్ అచేతనంచేయి" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "OpenGL వర్టెక్స్ బఫర్ వస్తువులు అచేతనంచేయి" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "GL పిగ్జెల్ బఫర్స్ అచేతనంచేయి" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "OpenGL పిగ్జెల్ బఫర్ వస్తువుల వుపయోగం అచేతనంచేయి" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "సాఫ్టువేర్ రెక్ట్ బదలాయింపును అచేతనంచేయి" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "దీర్ఘచతురస్త్ర జ్యామితి బదలాయించుటకు GPU వుపయోగించు" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Cogl నిపుణి" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "అట్లాస్ ప్రతిరూపాలను డంప్‌చేయి" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "టెక్చర్ అట్లాస్ మార్పులను ప్రతిరూప ఫైలునకు డంప్ చేయి" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "టెక్టర్ అట్లాసింగ్ అచేతనంచేయి" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "టెక్చర్ అట్లాసింగ్ వుపయోగంను అచేతనంచేయి" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "టెక్చర్ అట్లాస్‌ను పాఠము మరియు ప్రతిరూపముల మధ్య పంచుకొనుట అచేతనంచేయి" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." msgstr "" -"ఇది అమర్చివున్నప్పుడు గ్లిఫ్ క్యాచీ యెల్లప్పుడూ ప్రత్యేక టెక్చర్‌ను దాని అట్లాస్ కొరకు వుపయోగించును. లేకపోతే " +"ఇది అమర్చివున్నప్పుడు గ్లిఫ్ క్యాచీ యెల్లప్పుడూ ప్రత్యేక టెక్చర్‌ను దాని " +"అట్లాస్ కొరకు వుపయోగించును. లేకపోతే " "యిది అట్లాస్‌ను ప్రతిరూపములతో పంచుకొనుటకు ప్రయత్నించును." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "టెక్టరింగ్ అచేతనం చేయి" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "ఏ ధాతువుల టెక్చరింగైనా అచేతనంచేయి" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "arbfp అచేతనంచేయి" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "ARB ఫ్రాగ్‌మెంట్ ప్రోగ్రామ్స్ అచేతనంచేయి" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "నిర్దిష్టత అచేతనంచేయి" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "నిర్దిష్ట ప్రమేయ పైప్‌లైన్ బాకెండ్ వుపయోగం అచేతనంచేయి" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "GLSL అచేతనంచేయి" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "GLSL వుపయోగం అచేతనంచేయి" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "మిశ్రణం అచేతనంచేయి" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "మిశ్రణం వుపయోగం అచేతనంచేయి" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "non-power-of-two టెక్చర్లు అచేతనంచేయి" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." msgstr "" -"GL డ్రైవర్ NPOT టెక్చర్సుకు తోడ్పాటునీయదని Cogl అనుకొనునట్లు చేయును అలా అది వ్యర్థంతో స్లైస్‌డ్ " +"GL డ్రైవర్ NPOT టెక్చర్సుకు తోడ్పాటునీయదని Cogl అనుకొనునట్లు చేయును అలా అది " +"వ్యర్థంతో స్లైస్‌డ్ " "టెక్చర్స్ లేదా టెక్చర్స్ ను సృష్టిస్తుంది." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "సాఫ్టువేర్ క్లిప్పింగ్ అచేతనంచేయి" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." -msgstr "సాఫ్టువేర్ నందు కొన్ని దీర్ఘచతురస్త్రాలను క్లిప్ చేయుటకు Cogl యొక్క ప్రయత్నాలను అచేతనంచేయును." +msgstr "" +"సాఫ్టువేర్ నందు కొన్ని దీర్ఘచతురస్త్రాలను క్లిప్ చేయుటకు Cogl యొక్క " +"ప్రయత్నాలను అచేతనంచేయును." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "మూలమును చూపు" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "జనియింపచేసిన ARBfp/GLSL మూలపు కోడ్ చూపుము" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "OpenGL జాడ పట్టు" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "ఎంపికచేసిన OpenGL కాల్స్ జాడ పట్టును" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "offscreen తోడ్పాటు జాడ పట్టు" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "offscreen తోడ్పాటు డీబగ్ చేయి" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "ప్రోగ్రామ్ క్యాచీలను అచేతనంచేయి" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "arbfp మరియు glsl ప్రోగ్రామ్స్ కొరకు ఫాల్‌బాక్ క్యాచీలను అచేతనం చేయి" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "పిగ్జెల్ ఆప్టిమైజేషన్ చదువుట అచేతనం చేయి" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" -msgstr "అస్వచ్ఛ దీర్ఘచతురస్త్రాల సాదారణ సన్నివేశాల కొరకు 1px చదువుటకు ఆప్టిమైజేషన్ అచేతనంచేయి" +msgstr "" +"అస్వచ్ఛ దీర్ఘచతురస్త్రాల సాదారణ సన్నివేశాల కొరకు 1px చదువుటకు ఆప్టిమైజేషన్ " +"అచేతనంచేయి" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "క్లిప్పింగ్ జాడ పట్టు" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Cogl యెలా క్లిప్పింగ్ అమలుచేస్తోందో గురించిన లాగ్స్ సమాచారం" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "ప్రదర్శన పరిగణలు కనుగోనటం" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "ఉప ఐచ్ఛికం Cogl ఉపయోగ ఎత్తిచూపే ప్రయత్నిస్తుంది." + +#~ msgid "Cogl debugging flags to set" +#~ msgstr "Cogl క్రమబద్దీకరించడానికి దోష నివారణ జెండాలు" + +#~ msgid "Cogl debugging flags to unset" +#~ msgstr "Cogl క్రమరహిత పరచడానికి దోష నివారణ జెండాలు" + +#~ msgid "Cogl Options" +#~ msgstr "Cogl ఇచ్ఛికాలు" + +#~ msgid "Show Cogl options" +#~ msgstr "Cogl ఇచ్ఛికాలను చూపుము" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/th.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/th.gmo differ diff -Nru cogl-1.22.0/po/th.po cogl-1.22.2/po/th.po --- cogl-1.22.0/po/th.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/th.po 2016-02-23 12:06:45.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: cogl cogl-1.12\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-10-02 17:52+0000\n" "PO-Revision-Date: 2012-10-15 13:01+0700\n" "Last-Translator: Unticha Pramgoed \n" "Language-Team: Thai \n" @@ -18,225 +18,225 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.5.3\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "ค่าดีบั๊กที่รองรับ:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "ค่าดีบั๊กพิเศษ:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "เปิดใช้ตัวเลือกดีบั๊กที่ไม่เกี่ยวกับพฤติกรรมทั้งหมด" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "ตัวแปรสภาวะแวดล้อมเพิ่มเติม:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "รายชื่อคั่นด้วยจุลภาคของส่วนขยาย GL ที่จะทำทีว่าปิดใช้งาน" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "ทับค่ารุ่นของ GL ที่ Cogl จะถือว่าไดรเวอร์รองรับ" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:237 msgid "Cogl debugging flags to set" msgstr "แฟล็กดีบั๊กของ Cogl ที่จะเปิดใช้" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:239 msgid "Cogl debugging flags to unset" msgstr "แฟล็กดีบั๊กของ Cogl ที่จะปิด" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:288 msgid "Cogl Options" msgstr "ตัวเลือกของ Cogl" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:289 msgid "Show Cogl options" msgstr "แสดงตัวเลือกของ Cogl" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "การแกะรอย Cogl" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "การอ้าง CoglObject" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "ดีบั๊กเรื่องจำนวนการอ้างสำหรับ CoglObject" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "แกะรอยการซอยเนื้อวัสดุ" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "ดีบั๊กการสร้างแผ่นซอยของเนื้อวัสดุ" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "แกะรอยเนื้อวัสดุแบบแอตลาส" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "ดีบั๊กการจัดการเนื้อวัสดุแบบแอตลาส" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "แกะรอยข้อความบรรยายการเกลี่ย" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "ดีบั๊กการแจง CoglBlendString" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "แกะรอยใบจดคำสั่ง" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "ดูคำสั่งเรขาคณิตทั้งหมดที่ส่งผ่านใบจดคำสั่ง" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "แกะรอยการสร้างชุดคำสั่ง" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "แสดงการสะสมคำสั่งเรขาคณิตเป็นชุดในใบจดคำสั่ง" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "แกะรอยเมทริกซ์" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "แกะรอยการกระทำเมทริกซ์ทั้งหมด" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "แกะรอยการวาดจิปาถะ" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "แกะรอยการกระทำบางอย่างที่เกี่ยวกับการวาดจิปาถะ" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "แกะรอยตัววาด Pango" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "แกะรอยตัววาด Pango ของ Cogl" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "แกะรอยแบ็กเอนด์ CoglTexturePixmap" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "แกะรอยแบ็กเอนด์ภาพเนื้อวัสดุแบบบิตแมปของ Cogl" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "การแสดงวัตถุ" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "ตีเส้นโครงสี่เหลี่ยม" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "เพิ่มเส้นโครงของวัตถุเรขาคณิตรูปสี่เหลี่ยมผืนผ้าทั้งหมด" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "แสดงโครงลวด" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "เพิ่มเส้นโครงลวดของวัตถุเรขาคณิตทั้งหมด" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "การจัดแจงระดับราก" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "ปิดการสะสมคำสั่งเป็นชุดในใบจดคำสั่ง" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "ปิดการสะสมคำสั่งเรขาคณิตเป็นชุดในใบจดคำสั่งของ Cogl" -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "ปิดบัฟเฟอร์จุดยอดของ GL" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "ปิดการใช้วัตถุบัฟเฟอร์จุดยอดของ OpenGL" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "ปิดบัฟเฟอร์พิกเซลของ GL" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "ปิดการใช้วัตถุบัฟเฟอร์พิกเซลของ OpenGL" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "ปิดการแปลงสี่เหลี่ยมด้วยซอฟต์แวร์" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "ใช้ GPU ในการแปลงเรขาคณิตสี่เหลี่ยมผืนผ้า" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "ผู้ชำนาญเฉพาะ Cogl" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "ดัมป์ภาพแอตลาส" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "ดัมป์การเปลี่ยนแปลงในแอตลาสของเนื้อวัสดุออกเป็นแฟ้มรูปภาพ" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "ปิดการทำแอตลาสกับเนื้อวัสดุ" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "ปิดการทำแอตลาสกับเนื้อวัสดุ" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "ปิดการใช้แอตลาสเนื้อวัสดุร่วมกันระหว่างข้อความและรูปภาพ" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -244,51 +244,51 @@ "เมื่อกำหนดค่านี้ แคชของ glyph จะใช้เนื้อวัสดุต่างหากในแอตลาสที่ใช้เสมอ มิฉะนั้น " "ก็จะพยายามใช้แอตลาสร่วมกับรูปภาพต่างๆ" -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "ปิดการใส่เนื้อวัสดุ" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "ปิดการใส่เนื้อวัสดุกับวัตถุมูลฐานใดๆ" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "ปิดการใช้ arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "ปิดการใช้โปรแกรมคำนวณชิ้นส่วนแบบ ARB" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "ปิดฟังก์ชันตายตัว" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "ปิดการใช้แบ็กเอนด์ของไปป์ไลน์แบบฟังก์ชันตายตัว" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "ปิดการใช้ GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "ปิดการใช้งาน GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "ปิดการเกลี่ย" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "ปิดใช้งานการเกลี่ย" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "ปิดการใช้เนื้อวัสดุที่ไม่ใช่กำลังของสอง" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -296,67 +296,67 @@ "กำหนดให้ Cogl คิดว่าไดรเวอร์ GL ไม่รองรับข้อมูลเนื้อวัสดุแบบ NPOT (ไม่ใช่กำลังของสอง) เพื่อให้ " "Cogl สร้างเนื้อวัสดุแบบซอยหรือเนื้อวัสดุที่เป็นขยะแทน" -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "ปิดการขริบด้วยซอฟต์แวร์" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "ปิดไม่ให้ Cogl พยายามขริบสี่เหลี่ยมผืนผ้าด้วยซอฟต์แวร์" -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "แสดงซอร์ส" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "แสดงซอร์ดโค้ด ARBfp/GLSL ที่สร้าง" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "แกะรอย OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "แกะรอยการเรียก OpenGL ที่เลือก" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "แกะรอยการรองรับการวาดนอกจอ" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "ดีบั๊กการรองรับการวาดนอกจอ" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "ปิดการใช้แคชของโปรแกรม" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "ปิดการใช้แคชสำรองสำหรับโปรแกรม arbfp และ glsl " -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "ปิดการปรับประสิทธิภาพการอ่านพิกเซล" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "ปิดการปรับประสิทธิภาพของการอ่าน 1px สำหรับกรณีอย่างง่ายของสี่เหลี่ยมทึบ" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "แกะรอยการขริบ" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "เก็บปูมข้อมูลเกี่ยวกับการทำงานของ Cogl ในการขริบ" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "แกะรอยเกี่ยวกับประสิทธิภาพ" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "พยายามชี้การใช้งาน Cogl ที่ด้อยประสิทธิภาพ" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/tr.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/tr.gmo differ diff -Nru cogl-1.22.0/po/tr.po cogl-1.22.2/po/tr.po --- cogl-1.22.0/po/tr.po 2015-09-16 14:13:05.000000000 +0000 +++ cogl-1.22.2/po/tr.po 2016-02-23 12:06:45.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2015-02-14 04:10+0000\n" "PO-Revision-Date: 2015-02-21 06:03+0200\n" "Last-Translator: Muhammet Kara \n" "Language-Team: Turkish \n" @@ -23,225 +23,225 @@ "X-Generator: Gtranslator 2.91.6\n" "X-POOTLE-MTIME: 1423927523.000000\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:181 msgid "Supported debug values:" msgstr "Desteklenen hata ayıklama değerleri:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:186 msgid "Special debug values:" msgstr "Özel hata ayıklama değerleri:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:188 ../cogl/cogl-debug.c:190 msgid "Enables all non-behavioural debug options" msgstr "Bütün davranışsal olmayan hata ayıklama seçeneklerini etkinleştirir" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:197 msgid "Additional environment variables:" msgstr "Ek çevresel değişkenler:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:198 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "GL uzantılarının virgülle ayrılmış listesi kapalı" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:200 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "Cogl'un sürücü desteğini üstleneceği GL sürümünü geçersiz kıl" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:244 msgid "Cogl debugging flags to set" msgstr "Atanacak Cogl hata ayıklama imleri" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:246 msgid "Cogl debugging flags to unset" msgstr "Kaldırılacak Cogl hata ayıklama imleri" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:295 msgid "Cogl Options" msgstr "Cogl Seçenekleri" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:296 msgid "Show Cogl options" msgstr "Cogl seçeneklerini göster" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:32 ../cogl/cogl-debug-options.h:37 +#: ../cogl/cogl-debug-options.h:42 ../cogl/cogl-debug-options.h:47 +#: ../cogl/cogl-debug-options.h:52 ../cogl/cogl-debug-options.h:57 +#: ../cogl/cogl-debug-options.h:62 ../cogl/cogl-debug-options.h:68 +#: ../cogl/cogl-debug-options.h:73 ../cogl/cogl-debug-options.h:78 +#: ../cogl/cogl-debug-options.h:165 ../cogl/cogl-debug-options.h:170 +#: ../cogl/cogl-debug-options.h:175 ../cogl/cogl-debug-options.h:191 +#: ../cogl/cogl-debug-options.h:196 msgid "Cogl Tracing" msgstr "Cogl İzleme" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:34 msgid "CoglObject references" msgstr "CoglObject kaynakları" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:35 msgid "Debug ref counting issues for CoglObjects" msgstr "CoglObject için hata ayıklama referans sayma sorunu" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:39 msgid "Trace Texture Slicing" msgstr "Yapı Dilimi İzle" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:40 msgid "debug the creation of texture slices" msgstr "yapı dilimleri oluşturma hatalarını ayıkla" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:44 msgid "Trace Atlas Textures" msgstr "Atlas Dokularını İzle" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:45 msgid "Debug texture atlas management" msgstr "Doku atlas yönetimini için hata ayıkla" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:49 msgid "Trace Blend Strings" msgstr "Karışım Dizgelerini İzle" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:50 msgid "Debug CoglBlendString parsing" msgstr "CoglBlendString ayrıştırması için hata ayıkla" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:54 msgid "Trace Journal" msgstr "Günlüğü İzle" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:55 msgid "View all the geometry passing through the journal" msgstr "Günlükten geçen tüm geometriyi görüntüle" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:59 msgid "Trace Batching" msgstr "Yığınlamayı İzle" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:60 msgid "Show how geometry is being batched in the journal" msgstr "Geometrinin, günlükte nasıl yığınlanacağını göster" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace matrices" msgstr "Matrisleri izle" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:65 msgid "Trace all matrix manipulation" msgstr "Tüm matris işlemlerini izle" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:70 msgid "Trace Misc Drawing" msgstr "Çeşitli Çizimleri İzle" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:71 msgid "Trace some misc drawing operations" msgstr "Çeşitli çizim işlemlerini izle" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:75 msgid "Trace Pango Renderer" msgstr "Pango Gerçekleyicisini İzle" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:76 msgid "Trace the Cogl Pango renderer" msgstr "Cogl Pango gerçekleyicisini izle" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:80 msgid "Trace CoglTexturePixmap backend" msgstr "CoglTexturePixmap arka yüzünü izle" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:81 msgid "Trace the Cogl texture pixmap backend" msgstr "Cogl doku piksel haritası arka yüzünü izle" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:83 ../cogl/cogl-debug-options.h:88 msgid "Visualize" msgstr "Görselle" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:85 msgid "Outline rectangles" msgstr "Dikdörtgenleri seviyelendir" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:86 msgid "Add wire outlines for all rectangular geometry" msgstr "Tüm dikdörtgensel geometriler için tel seviyeler ekle" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:90 msgid "Show wireframes" msgstr "Tel çerceveyi göster" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:91 msgid "Add wire outlines for all geometry" msgstr "Tüm geometriler için tel seviyeler ekle" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:93 ../cogl/cogl-debug-options.h:98 +#: ../cogl/cogl-debug-options.h:103 ../cogl/cogl-debug-options.h:108 +#: ../cogl/cogl-debug-options.h:118 ../cogl/cogl-debug-options.h:123 +#: ../cogl/cogl-debug-options.h:129 ../cogl/cogl-debug-options.h:134 +#: ../cogl/cogl-debug-options.h:139 ../cogl/cogl-debug-options.h:144 +#: ../cogl/cogl-debug-options.h:149 ../cogl/cogl-debug-options.h:154 +#: ../cogl/cogl-debug-options.h:160 ../cogl/cogl-debug-options.h:180 +#: ../cogl/cogl-debug-options.h:185 msgid "Root Cause" msgstr "Temel Neden" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:95 msgid "Disable Journal batching" msgstr "Günlük Yığınlamayı Kapat" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:96 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Cogl Günlüğü 'nde geometrilerin yığınlamasını kapat" -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:100 msgid "Disable GL Vertex Buffers" msgstr "GL Vertex Tamponlarını Kapat" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:101 msgid "Disable use of OpenGL vertex buffer objects" msgstr "OpenGL vertex tampon nesnelerinin kullanımını kapat" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:105 msgid "Disable GL Pixel Buffers" msgstr "GL Piksel Tamponlarını Kapat" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:106 msgid "Disable use of OpenGL pixel buffer objects" msgstr "OpenGL piksel tamponu nesnelerinin kullanımını kapat" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:110 msgid "Disable software rect transform" msgstr "Yazılımsal dikdörtgen dönüşümünü kapat" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:111 msgid "Use the GPU to transform rectangular geometry" msgstr "Dikdörtgen geometrisi dönüşümü için GPU kullan" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:113 msgid "Cogl Specialist" msgstr "Cogl Uzmanı" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:115 msgid "Dump atlas images" msgstr "Atlas resimlerini dök" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:116 msgid "Dump texture atlas changes to an image file" msgstr "Doku atlası değişimlerini bir resim dosyasına dök" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:120 msgid "Disable texture atlasing" msgstr "Doku atlaslamayı kapat" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:121 msgid "Disable use of texture atlasing" msgstr "Doku atlası kullanımını kapat" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable sharing the texture atlas between text and images" msgstr "Metin ve resimler arası doku atlası paylaşımını kapat" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:126 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -249,51 +249,51 @@ "Bu ayarlandığında glyph ön belleği her zaman dokuyu onun atlaslarına " "ayıracaktır. Diğer türlü atlası resimlerle birlikte paylaşmaya çalışır." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:131 msgid "Disable texturing" msgstr "Desenlemeyi kapat" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:132 msgid "Disable texturing any primitives" msgstr "Herhangi bir ilkel için desenlemeyi kapat" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:136 msgid "Disable arbfp" msgstr "arbfb kapat" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:137 msgid "Disable use of ARB fragment programs" msgstr "ARB parça programlarının kullanımını kapat" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:141 msgid "Disable fixed" msgstr "Sabitlenmişi kapat" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:142 msgid "Disable use of the fixed function pipeline backend" msgstr "Sabitlenmiş fonksiyon boru hattı arka yüzünün kullanımını kapat" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:146 msgid "Disable GLSL" msgstr "GLSL kapat" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:147 msgid "Disable use of GLSL" msgstr "GLSL kullanımını kapat" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:151 msgid "Disable blending" msgstr "Karıştırmayı kapat" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:152 msgid "Disable use of blending" msgstr "Karıştırma kullanımını kapat" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:156 msgid "Disable non-power-of-two textures" msgstr "İkinin kuvveti olmayan dokuları kapat" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:157 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -301,71 +301,71 @@ "Cogl 'un GL sürücülerinin NPOT dokularını desteklemediğini düşünmesini " "sağlar. Böylece kesilmiş doku veya dokular oluşur ve zaman kaybı olmaz." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:162 msgid "Disable software clipping" msgstr "Yazılımsal kırpmayı kapat" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:163 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" "Cogl 'ın bazı dikdörtgenleri yazılımda kırpmaya çalışma girişimini kapatır" -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:167 msgid "Show source" msgstr "Kaynağı göster" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:168 msgid "Show generated ARBfp/GLSL source code" msgstr "Oluşturulmuş ARBfb/GLSL kaynak kodu" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:172 msgid "Trace some OpenGL" msgstr "Biraz OpenGL izle" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:173 msgid "Traces some select OpenGL calls" msgstr "Bazı seçilmiş OpenGL çağrılarını izler" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:177 msgid "Trace offscreen support" msgstr "Ekran dışı izleme desteği" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:178 msgid "Debug offscreen support" msgstr "Ekran dışı hata ayıklama desteği" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:182 msgid "Disable program caches" msgstr "Program ön belleklerini kapat" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:183 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "arbfb ve glsl programları için geri alma ön belleklerini kapat" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:187 msgid "Disable read pixel optimization" msgstr "Piksel okuma optimizasyonunu kapat" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:188 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Opak dikdörtgenlerin basit sahnelerinde 1 piksel okumak için optimizasyonu " "kapat" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:193 msgid "Trace clipping" msgstr "Kırpmayı izle" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:194 msgid "Logs information about how Cogl is implementing clipping" msgstr "" "Cogl'un kırpmayı nasıl uyguladığı hakkındaki bilgilerin günlüğünü tutar" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:198 msgid "Trace performance concerns" msgstr "Performans kaygılarını izle" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:199 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Alt optimal Cogl kullanımını vurgulamaya çalışır." Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/ug.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/ug.gmo differ diff -Nru cogl-1.22.0/po/ug.po cogl-1.22.2/po/ug.po --- cogl-1.22.0/po/ug.po 2015-09-16 14:13:06.000000000 +0000 +++ cogl-1.22.2/po/ug.po 2016-08-26 16:18:04.000000000 +0000 @@ -6,358 +6,351 @@ msgid "" msgstr "" "Project-Id-Version: cogl\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-03-17 00:42+0000\n" "PO-Revision-Date: 2013-03-17 13:32+0900\n" "Last-Translator: Gheyret Kenji \n" "Language-Team: Uyghur Computer Science Association \n" -"Language: \n" +"Language: ug\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "قوللايدىغان سازلاش قىممەتلىرى:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "ئالاھىدە سازلاش قىممەتلىرى:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "بارلىق non-behavioural سازلاش تاللانمىلىرىنى ئىناۋەتلىك قىلسۇن" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "قوشۇمچە مۇھىت ئۆزگەرگۈچىلىرى:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" -msgstr "" -"GL كېڭەيتىلمىسىدەك كۆرۈنىدىغان بىراق ئىشلەتكىلى بولمايدىغان، پەش ئارقىلىق " -"ئايرىلغان تىزىم" +msgstr "GL كېڭەيتىلمىسىدەك كۆرۈنىدىغان بىراق ئىشلەتكىلى بولمايدىغان، پەش ئارقىلىق ئايرىلغان تىزىم" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "قوزغاتقۇ قوللايدۇ دەپ Cogl پەرەز قىلغان GL نىڭ نەشرىنى يېپىۋەت" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:237 msgid "Cogl debugging flags to set" msgstr "Cogl نىڭ بەلگىلەيدىغان سازلاش تاللانمىلىرى" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:239 msgid "Cogl debugging flags to unset" msgstr "Cogl نىڭ قىممىتى يوق قىلىنىدىغان سازلاش تاللانمىلىرى" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:288 msgid "Cogl Options" msgstr "Cogl تاللانمىلىرى" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:289 msgid "Show Cogl options" msgstr "Cogl تاللانمىلىرى كۆرسىتىش" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Cogl ئىزلىشى" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "CoglObject پايدىلانمىلىرى" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "CoglObjects پايدىلانمىلىرىنىڭ ساناش مەسىلىسىنى سازلايدۇ" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Texture Slicing نى ئىزلاش" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "texture slices نىڭ قۇرۇلۇشىنى سازلاش" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Atlas Textures نى ئىزلاش" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "texture atlas باشقۇرۇشنى سازلاش" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "تېكىستنى بىرىكتۈرۈشنى ئىزلا" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "CoglBlendString نى تەھلىل قىلىشنى سازلايدۇ" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "ژۇرنالنى ئىزلا" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "ژۇرنالغا يوللاپ بېرىلگەن بارلىق شەكىللەرنى كۆرىدۇ" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "توپ بىر تەرەپ قىلىشنى ئىزلا" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "ژۇرنالدا شەكىللەرنىڭ قانداق توپ بىر تەرەپ قىلىنىدىغانلىقىنى كۆرسىتىدۇ" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "ماترىتسانى ئىزلا" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "بارلىق ماترىتسا مەشغۇلاتىنى ئىزلايدۇ" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "باشقا سىزىشنى ئىزلا" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "باشقا سىزىش مەشغۇلاتلىرىنى ئىزلايدۇ" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "پانگو سىزغۇچىنى ئىزلا" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Cogl پانگو سىزغۇچىنى ئىزلايدۇ" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "CoglTexturePixmap ئارقا ئۇچنى ئىزلا" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Cogl Texture Pixmap ئارقا ئۇچىنى ئىزلايدۇ" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "سۈرەتلەشتۈر" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "تىك تۆت تەرەپلىكنىڭ ئىزناسى" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "تىك تۆت تەرەپلىك شەكىللەرنىڭ سىم ئىزناسىنى قوشىدۇ" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "سىملىق قۇرۇلمىسىنى كۆرسەت" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "بارلىق شەكىللەرگە سىم ئىزنا قوشىدۇ" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "ئەسلى سەۋەبى" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "ژۇرنال بىر تەرەپ قىلىشنى ئىناۋەتسىز قىل" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." -msgstr "" -"Cogl ژۇرنالدىكى سىرتقى كۆرۈنۈشنى توپ بىر تەرەپ قىلىشنى ئىناۋەتسىز قىلىدۇ." +msgstr "Cogl ژۇرنالدىكى سىرتقى كۆرۈنۈشنى توپ بىر تەرەپ قىلىشنى ئىناۋەتسىز قىلىدۇ." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "GL Vertex يىغلەكىنى ئىناۋەتسىز قىل" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "OpenGL نىڭ vertex يىغلەك نەڭلىرىنى ئىناۋەتسىز قىلىدۇ" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "GL نىڭ پىكسېل يىغلەكىنى ئىناۋەتسىز قىل" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "\"OpenGL نىڭ پىكسېل يىغلەك نەڭلىرىنى ئىناۋەتسىز قىلىدۇ" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "يۇمشاق دېتالدا تىك تۆتبۇلۇڭ ئۆزگەرتىشنى ئىناۋەتسىز قىل" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "بۇنىڭ ئۈچۈن GPU نىڭ ئۆزگەرتىش ئىقتىدارىنى ئىشلىتىدۇ" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Cogl مۇتەخەسسىسى" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "atlas سۈرەتلىرىگە تۆكسۇن" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "texture atlas نىڭ ئۆزگىرىشلىرىنى سۈرەت ھۆججىتىگە تۆكىدۇ" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "texture atlasing نى ئىناۋەتسىز قىلسۇن" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "texture atlasing ئىشلىتىشنى ئىناۋەتسىز قىلسۇن" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" -msgstr "" -"تېكىست بىلەن سۈرەت ئارىسىدا texture atlas نى ھەمبەھىر قىلىشنى ئىناۋەتسىز " -"قىلىدۇ" +msgstr "تېكىست بىلەن سۈرەت ئارىسىدا texture atlas نى ھەمبەھىر قىلىشنى ئىناۋەتسىز قىلىدۇ" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." msgstr "" -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "texturing نى ئىناۋەتسىز قىل" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "arbfp نى ئىناۋەتسىز قىل" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "ARB پارچە پروگراممىلىرىنى ئىشلىتىشنى ئىناۋەتسىز قىلىدۇ" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "مۇقىم ئىقتىدار نەيچىسىنى ئىناۋەتسىز قىل" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "مۇقىم ئىقتىدار نەيچىسىنىڭ ئارقا ئۇچنى ئىشلىتىشنى ئىناۋەتسىز قىلىدۇ" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "GLSL نى ئىناۋەتسىز قىل" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "GLSL نى ئىشلىتىشنى ئىناۋەتسىز قىلىدۇ" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "ئارىلاشتۇرۇش(blending)نى ئىناۋەتسىز قىل" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "ئارىلاشتۇرۇش(blending)نى ئىشلىتىشنى ئىناۋەتسىز قىلىدۇ" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." msgstr "" -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "ئەسلى كودىنى كۆرسەت" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "ھاسىللانغان ARBfp/GLSL ئەسلى كودىنى كۆرسىتىدۇ" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "بىر قىسىم OpenGL نى ئىزلا" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "بىر قىسىم OpenGL چاقىرىشلىرىنى ئىزلايدۇ" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "ئېكرانسىز قوللاشنى ئىزلا" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "ئېكرانسىز قوللاشنى سازلايدۇ" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "پروگرامما غەملىكىنى ئىناۋەتسىز قىل" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" -msgstr "" -"بۇ، arbfp ۋە glsl پروگراممىلىرىنىڭ fallback غەملىكىنى ئىناۋەتسىز قىلىدۇ" +msgstr "بۇ، arbfp ۋە glsl پروگراممىلىرىنىڭ fallback غەملىكىنى ئىناۋەتسىز قىلىدۇ" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "پىكسېل ئوقۇشنى ئەلالاشتۇرۇشنى ئىناۋەتسىز قىل" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/uk.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/uk.gmo differ diff -Nru cogl-1.22.0/po/uk.po cogl-1.22.2/po/uk.po --- cogl-1.22.0/po/uk.po 2015-09-16 14:13:06.000000000 +0000 +++ cogl-1.22.2/po/uk.po 2016-02-23 12:06:45.000000000 +0000 @@ -5,9 +5,9 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=cogl&k" +"eywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2014-02-12 19:26+0000\n" "PO-Revision-Date: 2014-02-13 11:24+0300\n" "Last-Translator: Daniel Korostil \n" "Language-Team: linux.org.ua\n" @@ -15,230 +15,230 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Virtaal 0.7.1\n" "X-Project-Style: gnome\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "Підтримувані зневаджувальні значення:" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "Особливі зневаджувальні значення:" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "Вмикає всі неповедінкові зневаджувальні параметри" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "Додаткові змінні середовища:" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "Список, розділений комою, розширень GL, які варто вимкнути" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "Перезаписати версію GL, яку Cogl вважає, що драйвер підтримує" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:237 msgid "Cogl debugging flags to set" msgstr "Прапорці зневадження Cogl для встановлення" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:239 msgid "Cogl debugging flags to unset" msgstr "Прапорці зневадження Cogl для усунення" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:288 msgid "Cogl Options" msgstr "Параметри Cogl" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:289 msgid "Show Cogl options" msgstr "Показати параметри Cogl" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Трасування Cogl" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "Посилання CoglObject" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "Зневаджувальне підрахування помилок посилань CoglObjects" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "Маршрут нарізування текстур" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "Зневадження створення нарізів текстур" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "Маршрут текстур атласу" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "Керування зневадженням текстур атласу" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "Маршрут суміші рядків" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "Зневаджувальний аналізатор CoglBlendString" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "Маршрут журналу" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "Переглянути всі геометрії, які проходять через журнал" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "Маршрут пакування" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "Показати геометрію, яку запаковано в журнал" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "Маршрут матриці" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "Маршрут усіх маніпуляцій матрицею" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "Маршрут іншого малювання" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "Маршрут деяких інших операції щодо малювання" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "Маршрут відтворення Pango" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "Маршрут відтворення Cogl Pango" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "Маршрут модуля CoglTexturePixmap" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "Маршрут модуля зображення текстур Cogl" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "Візуалізувати" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "Контурні прямокутники" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "Додати прямий контур для всієї прямокутної геометрії" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "Показати каркаси" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "Додати прямі контури для всієї геометрії" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "Корінна причина" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "Вимкнути пакування журналу" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "Вимкнути пакування геометрії в журналі Cogl." -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "Вимкнути вершинні буфери GL" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "Вимкнути об'єкти вершинного буфера OpenGL" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "Вимкнути зображувальні буфери GL" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "Вимкнути об'єкти зображувального буфера OpenGL" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "Вимкнути прямокутного перетворення у програмі " -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "Використати GPU для перетворення прямокутної геометрії" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Знавець з Cogl" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "Дамп зображень атласу" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "Дамп змін текстур атласу для малюнку" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "Вимкнути текстури атласу" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "Вимкнути використання текстур атласу" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "Вимкнути обмін текстур атласу між текстом і зображенням" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -246,51 +246,51 @@ "Коли це вказано, кеш гліфів завжди використовуватиме окремі текстури для " "свого атласу. Інакше воно намагатиметься поділити атлас через зображення." -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "Вимкнути текстури" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "Вимкнути текстури будь-яких примітивів" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "Вимкнути arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "Вимкнути використання програм з фрагментами ARB" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "Вимкнути fixed" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "Вимкнути використання функції fixed для модуля каналу даних" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "Вимкнути GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "Вимкнути використання GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "Вимкнути накладання" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "Вимкнути використання накладання" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "Вимкнути текстури non-power-of-two" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -298,69 +298,69 @@ "Змушує Cogl уважати, що драйвер GL не підтримує текстури NPOT, тобто він " "створить нарізані текстури або натомість текстури з обрізків." -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "Вимкнути програмне обрізання" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "Вимкнути спроби Cogl обрізати деякі прямокутники в програмі." -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "Показати джерело" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "Показати породжений код ARBfp/GLSL" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "Маршрут деяких OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "Маршрут деяких вибраних викликів OpenGL" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "Маршрут закадрового підтримування" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "Зневадження закадрового підтримування" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "Вимкнути кеші програм" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "Вимкнути запасні кеші для програм arbfp і glsl" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "Вимкнути оптимізування пікселів для читання" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" "Вимкнути оптимізування для читання одного пікселя для простих сцен " "непрозорих прямокутників" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "Маршрут обрізання" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "Записує інформацію про спосіб реалізації обрізання в Cogl" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "Слідкувати за проблемами продуктивності" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "Намагається висвітлювати підоптмальне використання Cogl." Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/vi.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/vi.gmo differ diff -Nru cogl-1.22.0/po/vi.po cogl-1.22.2/po/vi.po --- cogl-1.22.0/po/vi.po 2015-09-16 14:13:06.000000000 +0000 +++ cogl-1.22.2/po/vi.po 2016-02-23 12:06:45.000000000 +0000 @@ -8,7 +8,7 @@ "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"POT-Creation-Date: 2012-03-05 23:14+0000\n" "PO-Revision-Date: 2011-10-02 11:02+1100\n" "Last-Translator: Nguyễn Thái Ngọc Duy \n" "Language-Team: Vietnamese \n" @@ -18,341 +18,320 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: cogl/cogl-debug.c:181 +#: cogl/cogl-debug.c:172 msgid "Supported debug values:" msgstr "" -#: cogl/cogl-debug.c:186 +#: cogl/cogl-debug.c:177 msgid "Special debug values:" msgstr "" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: cogl/cogl-debug.c:179 cogl/cogl-debug.c:181 msgid "Enables all non-behavioural debug options" msgstr "" -#: cogl/cogl-debug.c:197 -msgid "Additional environment variables:" -msgstr "" - -#: cogl/cogl-debug.c:198 -msgid "Comma-separated list of GL extensions to pretend are disabled" -msgstr "" - -#: cogl/cogl-debug.c:200 -msgid "Override the GL version that Cogl will assume the driver supports" -msgstr "" - -#: cogl/cogl-debug.c:244 +#: cogl/cogl-debug.c:225 msgid "Cogl debugging flags to set" msgstr "Bật cờ tìm lỗi Cogl" -#: cogl/cogl-debug.c:246 +#: cogl/cogl-debug.c:227 msgid "Cogl debugging flags to unset" msgstr "Tắt cờ tìm lỗi Cogl" -#: cogl/cogl-debug.c:295 +#: cogl/cogl-debug.c:276 msgid "Cogl Options" msgstr "Tuỳ chọn Cogl" -#: cogl/cogl-debug.c:296 +#: cogl/cogl-debug.c:277 msgid "Show Cogl options" msgstr "Hiện tuỳ chọn Cogl" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: cogl/cogl-debug-options.h:25 cogl/cogl-debug-options.h:30 +#: cogl/cogl-debug-options.h:35 cogl/cogl-debug-options.h:40 +#: cogl/cogl-debug-options.h:45 cogl/cogl-debug-options.h:50 +#: cogl/cogl-debug-options.h:55 cogl/cogl-debug-options.h:61 +#: cogl/cogl-debug-options.h:66 cogl/cogl-debug-options.h:71 +#: cogl/cogl-debug-options.h:158 cogl/cogl-debug-options.h:163 +#: cogl/cogl-debug-options.h:168 cogl/cogl-debug-options.h:184 msgid "Cogl Tracing" msgstr "" -#: cogl/cogl-debug-options.h:34 +#: cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "" -#: cogl/cogl-debug-options.h:35 +#: cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "" -#: cogl/cogl-debug-options.h:39 +#: cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "" -#: cogl/cogl-debug-options.h:40 +#: cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "" -#: cogl/cogl-debug-options.h:44 +#: cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "" -#: cogl/cogl-debug-options.h:45 +#: cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "" -#: cogl/cogl-debug-options.h:49 +#: cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "" -#: cogl/cogl-debug-options.h:50 +#: cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "" -#: cogl/cogl-debug-options.h:54 +#: cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "" -#: cogl/cogl-debug-options.h:55 +#: cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "" -#: cogl/cogl-debug-options.h:59 +#: cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "" -#: cogl/cogl-debug-options.h:60 +#: cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "" -#: cogl/cogl-debug-options.h:64 +#: cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "" -#: cogl/cogl-debug-options.h:65 +#: cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "" -#: cogl/cogl-debug-options.h:70 +#: cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "" -#: cogl/cogl-debug-options.h:71 +#: cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "" -#: cogl/cogl-debug-options.h:75 +#: cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "" -#: cogl/cogl-debug-options.h:76 +#: cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "" -#: cogl/cogl-debug-options.h:80 +#: cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:81 +#: cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: cogl/cogl-debug-options.h:76 cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "" -#: cogl/cogl-debug-options.h:85 +#: cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "" -#: cogl/cogl-debug-options.h:86 +#: cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:90 +#: cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "" -#: cogl/cogl-debug-options.h:91 +#: cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: cogl/cogl-debug-options.h:86 cogl/cogl-debug-options.h:91 +#: cogl/cogl-debug-options.h:96 cogl/cogl-debug-options.h:101 +#: cogl/cogl-debug-options.h:111 cogl/cogl-debug-options.h:116 +#: cogl/cogl-debug-options.h:122 cogl/cogl-debug-options.h:127 +#: cogl/cogl-debug-options.h:132 cogl/cogl-debug-options.h:137 +#: cogl/cogl-debug-options.h:142 cogl/cogl-debug-options.h:147 +#: cogl/cogl-debug-options.h:153 cogl/cogl-debug-options.h:173 +#: cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "" -#: cogl/cogl-debug-options.h:95 +#: cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "" -#: cogl/cogl-debug-options.h:96 +#: cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "" -#: cogl/cogl-debug-options.h:100 +#: cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "" -#: cogl/cogl-debug-options.h:101 +#: cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:105 +#: cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "" -#: cogl/cogl-debug-options.h:106 +#: cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "" -#: cogl/cogl-debug-options.h:110 +#: cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "" -#: cogl/cogl-debug-options.h:111 +#: cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "" -#: cogl/cogl-debug-options.h:113 +#: cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "" -#: cogl/cogl-debug-options.h:115 +#: cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "" -#: cogl/cogl-debug-options.h:116 +#: cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "" -#: cogl/cogl-debug-options.h:120 +#: cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:121 +#: cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "" -#: cogl/cogl-debug-options.h:125 +#: cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "" -#: cogl/cogl-debug-options.h:126 +#: cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." msgstr "" -#: cogl/cogl-debug-options.h:131 +#: cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "" -#: cogl/cogl-debug-options.h:132 +#: cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "" -#: cogl/cogl-debug-options.h:136 +#: cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "" -#: cogl/cogl-debug-options.h:137 +#: cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "" -#: cogl/cogl-debug-options.h:141 +#: cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "" -#: cogl/cogl-debug-options.h:142 +#: cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "" -#: cogl/cogl-debug-options.h:146 +#: cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "" -#: cogl/cogl-debug-options.h:147 +#: cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "" -#: cogl/cogl-debug-options.h:151 +#: cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "" -#: cogl/cogl-debug-options.h:152 +#: cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "" -#: cogl/cogl-debug-options.h:156 +#: cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "" -#: cogl/cogl-debug-options.h:157 +#: cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." msgstr "" -#: cogl/cogl-debug-options.h:162 +#: cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "" -#: cogl/cogl-debug-options.h:163 +#: cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "" -#: cogl/cogl-debug-options.h:167 +#: cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "" -#: cogl/cogl-debug-options.h:168 +#: cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "" -#: cogl/cogl-debug-options.h:172 +#: cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "" -#: cogl/cogl-debug-options.h:173 +#: cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "" -#: cogl/cogl-debug-options.h:177 +#: cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:178 +#: cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "" -#: cogl/cogl-debug-options.h:182 +#: cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "" -#: cogl/cogl-debug-options.h:183 +#: cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "" -#: cogl/cogl-debug-options.h:187 +#: cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "" -#: cogl/cogl-debug-options.h:188 +#: cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "" -#: cogl/cogl-debug-options.h:193 +#: cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "" -#: cogl/cogl-debug-options.h:194 +#: cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "" - -#: cogl/cogl-debug-options.h:198 -msgid "Trace performance concerns" -msgstr "" - -#: cogl/cogl-debug-options.h:199 -msgid "Tries to highlight sub-optimal Cogl usage." -msgstr "" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/zh_CN.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/zh_CN.gmo differ diff -Nru cogl-1.22.0/po/zh_CN.po cogl-1.22.2/po/zh_CN.po --- cogl-1.22.0/po/zh_CN.po 2015-09-16 14:13:06.000000000 +0000 +++ cogl-1.22.2/po/zh_CN.po 2016-02-23 12:06:45.000000000 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: cogl master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2014-03-08 04:10+0000\n" "PO-Revision-Date: 2014-03-08 20:33+0800\n" "Last-Translator: Wylmer Wang \n" "Language-Team: Chinese (simplified) \n" @@ -23,225 +23,225 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Gtranslator 2.91.5\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:181 msgid "Supported debug values:" msgstr "支持的调试值：" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:186 msgid "Special debug values:" msgstr "特殊的调试值：" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:188 ../cogl/cogl-debug.c:190 msgid "Enables all non-behavioural debug options" msgstr "启用所有非行为调式选项" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:197 msgid "Additional environment variables:" msgstr "附加环境变量：" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:198 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "逗号分隔的待伪装(pretend) GL 扩展列表 已禁用" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:200 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "覆盖 Cogl 将假设驱动支持的 GL 版本" -#: cogl/cogl-debug.c:244 +#: ../cogl/cogl-debug.c:244 msgid "Cogl debugging flags to set" msgstr "要设置的 Cogl 调试选项" -#: cogl/cogl-debug.c:246 +#: ../cogl/cogl-debug.c:246 msgid "Cogl debugging flags to unset" msgstr "要清除的 Cogl 调试选项" -#: cogl/cogl-debug.c:295 +#: ../cogl/cogl-debug.c:295 msgid "Cogl Options" msgstr "Cogl 选项" -#: cogl/cogl-debug.c:296 +#: ../cogl/cogl-debug.c:296 msgid "Show Cogl options" msgstr "显示 Cogl 选项" -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:32 ../cogl/cogl-debug-options.h:37 +#: ../cogl/cogl-debug-options.h:42 ../cogl/cogl-debug-options.h:47 +#: ../cogl/cogl-debug-options.h:52 ../cogl/cogl-debug-options.h:57 +#: ../cogl/cogl-debug-options.h:62 ../cogl/cogl-debug-options.h:68 +#: ../cogl/cogl-debug-options.h:73 ../cogl/cogl-debug-options.h:78 +#: ../cogl/cogl-debug-options.h:165 ../cogl/cogl-debug-options.h:170 +#: ../cogl/cogl-debug-options.h:175 ../cogl/cogl-debug-options.h:191 +#: ../cogl/cogl-debug-options.h:196 msgid "Cogl Tracing" msgstr "Cogl 跟踪" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:34 msgid "CoglObject references" msgstr "CoglObject 引用" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:35 msgid "Debug ref counting issues for CoglObjects" msgstr "调试 CoglObjects 的引用计数问题" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:39 msgid "Trace Texture Slicing" msgstr "跟踪纹理切片" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:40 msgid "debug the creation of texture slices" msgstr "调试纹理切片的创建" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:44 msgid "Trace Atlas Textures" msgstr "跟踪 Atlas 纹理" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:45 msgid "Debug texture atlas management" msgstr "调试纹理 atlas 管理" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:49 msgid "Trace Blend Strings" msgstr "跟踪混合字符串" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:50 msgid "Debug CoglBlendString parsing" msgstr "调试 CoglBlendString 解析" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:54 msgid "Trace Journal" msgstr "跟踪日志" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:55 msgid "View all the geometry passing through the journal" msgstr "查看所有通过日志传递的几何体" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:59 msgid "Trace Batching" msgstr "跟踪批处理" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:60 msgid "Show how geometry is being batched in the journal" msgstr "显示几何体在日志中批处理的情况" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace matrices" msgstr "跟踪矩阵" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:65 msgid "Trace all matrix manipulation" msgstr "跟踪所有矩阵操作" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:70 msgid "Trace Misc Drawing" msgstr "跟踪混杂绘制" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:71 msgid "Trace some misc drawing operations" msgstr "跟踪一些混杂的绘制操作" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:75 msgid "Trace Pango Renderer" msgstr "跟踪 Pango 渲染器" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:76 msgid "Trace the Cogl Pango renderer" msgstr "跟踪 Cogl Pango 渲染器" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:80 msgid "Trace CoglTexturePixmap backend" msgstr "跟踪 CoglTexturePixmap 后端" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:81 msgid "Trace the Cogl texture pixmap backend" msgstr "跟踪 Cogl 纹理 pixmap 后端" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:83 ../cogl/cogl-debug-options.h:88 msgid "Visualize" msgstr "可视化" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:85 msgid "Outline rectangles" msgstr "突显矩形" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:86 msgid "Add wire outlines for all rectangular geometry" msgstr "对所有矩形形状添加实线外框" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:90 msgid "Show wireframes" msgstr "显示线框" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:91 msgid "Add wire outlines for all geometry" msgstr "对所有形状添加线框" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:93 ../cogl/cogl-debug-options.h:98 +#: ../cogl/cogl-debug-options.h:103 ../cogl/cogl-debug-options.h:108 +#: ../cogl/cogl-debug-options.h:118 ../cogl/cogl-debug-options.h:123 +#: ../cogl/cogl-debug-options.h:129 ../cogl/cogl-debug-options.h:134 +#: ../cogl/cogl-debug-options.h:139 ../cogl/cogl-debug-options.h:144 +#: ../cogl/cogl-debug-options.h:149 ../cogl/cogl-debug-options.h:154 +#: ../cogl/cogl-debug-options.h:160 ../cogl/cogl-debug-options.h:180 +#: ../cogl/cogl-debug-options.h:185 msgid "Root Cause" msgstr "根目标" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:95 msgid "Disable Journal batching" msgstr "禁用日志批处理" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:96 msgid "Disable batching of geometry in the Cogl Journal." msgstr "在 Cogl 日志中禁用几何体批处理" -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:100 msgid "Disable GL Vertex Buffers" msgstr "禁用 GL Vertex 缓冲" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:101 msgid "Disable use of OpenGL vertex buffer objects" msgstr "禁用使用 OpenGL 顶点缓存对象" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:105 msgid "Disable GL Pixel Buffers" msgstr "禁用 GL 像素缓存" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:106 msgid "Disable use of OpenGL pixel buffer objects" msgstr "禁止使用 OpenGL 像素缓存对象" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:110 msgid "Disable software rect transform" msgstr "禁用软件矩形变换" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:111 msgid "Use the GPU to transform rectangular geometry" msgstr "使用 GPU 来变换矩形" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:113 msgid "Cogl Specialist" msgstr "Cogl 专家" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:115 msgid "Dump atlas images" msgstr "转储 Atlas 图像" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:116 msgid "Dump texture atlas changes to an image file" msgstr "将纹理 Atlas 更改转储为图像文件" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:120 msgid "Disable texture atlasing" msgstr "禁用纹理平滑" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:121 msgid "Disable use of texture atlasing" msgstr "禁止使用纹理平滑" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable sharing the texture atlas between text and images" msgstr "禁用文本和图形间的纹理 Atlas 共享" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:126 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." @@ -249,118 +249,118 @@ "一旦设置，图形字符缓存 Atlas 将总是使用单独的纹理。否则，它将尝试与图像共享 " "Atlas。" -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:131 msgid "Disable texturing" msgstr "禁用纹理" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:132 msgid "Disable texturing any primitives" msgstr "禁止用任何元素使用纹理" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:136 msgid "Disable arbfp" msgstr "禁用 arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:137 msgid "Disable use of ARB fragment programs" msgstr "禁用 ARB 分割程序" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:141 msgid "Disable fixed" msgstr "禁止固定(fixed)" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:142 msgid "Disable use of the fixed function pipeline backend" msgstr "禁用固定的(fixed)函数管道后端" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:146 msgid "Disable GLSL" msgstr "禁用 GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:147 msgid "Disable use of GLSL" msgstr "禁止使用 GLSL" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:151 msgid "Disable blending" msgstr "禁用混合" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:152 msgid "Disable use of blending" msgstr "禁止使用混合" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:156 msgid "Disable non-power-of-two textures" msgstr "禁用(数量)非2的幂的纹理" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:157 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." msgstr "" "使 Cogl 认为 GL 驱动不支持 NPOT 纹理，以便使它创建切片纹理或用无效纹理代替。" -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:162 msgid "Disable software clipping" msgstr "禁用软件裁剪" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:163 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "禁止 Cogl 在软件中尝试裁剪某些矩形。" -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:167 msgid "Show source" msgstr "显示源代码" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:168 msgid "Show generated ARBfp/GLSL source code" msgstr "显示生成的 ARBfp/GLSL 源代码" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:172 msgid "Trace some OpenGL" msgstr "跟踪某些 OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:173 msgid "Traces some select OpenGL calls" msgstr "跟踪某些选择 OpenGL 的调用" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:177 msgid "Trace offscreen support" msgstr "跟踪幕后(offscreen)支持" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:178 msgid "Debug offscreen support" msgstr "调试幕后(offscreen)支持" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:182 msgid "Disable program caches" msgstr "禁用程序缓存" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:183 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "禁用 arbfp 和 glsl 程序的后备缓存" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:187 msgid "Disable read pixel optimization" msgstr "禁用读取像素优化" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:188 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "禁止对在透明矩形场景中读取单个像素操作的优化" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:193 msgid "Trace clipping" msgstr "跟踪裁剪" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:194 msgid "Logs information about how Cogl is implementing clipping" msgstr "记录有关 Cogl 如何实施裁剪的信息" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:198 msgid "Trace performance concerns" msgstr "跟踪性能问题" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:199 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "尝试突出显示欠佳的 Cogl 使用。" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/zh_HK.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/zh_HK.gmo differ diff -Nru cogl-1.22.0/po/zh_HK.po cogl-1.22.2/po/zh_HK.po --- cogl-1.22.0/po/zh_HK.po 2015-09-16 14:13:06.000000000 +0000 +++ cogl-1.22.2/po/zh_HK.po 2016-08-26 16:18:04.000000000 +0000 @@ -8,353 +8,346 @@ "Project-Id-Version: cogl 2.0.0\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"POT-Creation-Date: 2012-08-07 13:19+0800\n" "PO-Revision-Date: 2012-08-07 13:19+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Hong Kong) \n" -"Language: \n" +"Language: zh_HK\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:174 msgid "Supported debug values:" msgstr "支援的除錯數值：" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:179 msgid "Special debug values:" msgstr "特殊的除錯數值：" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183 msgid "Enables all non-behavioural debug options" msgstr "啟用所有非行為性的除錯選項" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:190 msgid "Additional environment variables:" msgstr "額外的環境變數：" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:191 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "準備停用的 GL 擴充功能清單 (以逗號分隔)" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:193 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "覆蓋 Cogl 假設驅動程式會支援的 GL 版本" -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "準備設定的 Cogl 偵錯旗標" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "準備去除的 Cogl 偵錯旗標" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "Cogl 選項" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "顯示 Cogl 選項" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30 +#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61 +#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184 +#: ../cogl/cogl-debug-options.h:189 msgid "Cogl Tracing" msgstr "Cogl 追蹤" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:27 msgid "CoglObject references" msgstr "CoglObject 參照" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:28 msgid "Debug ref counting issues for CoglObjects" msgstr "CoglObjects 的除錯參考持續問題" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:32 msgid "Trace Texture Slicing" msgstr "追蹤材質切割" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:33 msgid "debug the creation of texture slices" msgstr "材質切割建立的除錯" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:37 msgid "Trace Atlas Textures" msgstr "追蹤圖集材質" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:38 msgid "Debug texture atlas management" msgstr "除錯材質圖集管理" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:42 msgid "Trace Blend Strings" msgstr "追蹤混合字串" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:43 msgid "Debug CoglBlendString parsing" msgstr "除錯 CoglBlendString 解析" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:47 msgid "Trace Journal" msgstr "追蹤日誌" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:48 msgid "View all the geometry passing through the journal" msgstr "檢視所有通過日誌的位置大小" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:52 msgid "Trace Batching" msgstr "追蹤批次" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:53 msgid "Show how geometry is being batched in the journal" msgstr "顯示日誌中批次的幾何大小如何" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:57 msgid "Trace matrices" msgstr "追蹤矩陣" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:58 msgid "Trace all matrix manipulation" msgstr "追蹤所有的矩陣操作" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:63 msgid "Trace Misc Drawing" msgstr "追蹤雜項繪製" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace some misc drawing operations" msgstr "追蹤某些繪製操作" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:68 msgid "Trace Pango Renderer" msgstr "追蹤 Pango 繪製器" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:69 msgid "Trace the Cogl Pango renderer" msgstr "追蹤 Cogl Pango 繪製器" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:73 msgid "Trace CoglTexturePixmap backend" msgstr "追蹤 CoglTexturePixmap 後端" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:74 msgid "Trace the Cogl texture pixmap backend" msgstr "追蹤 Cogl Pango 材質點陣圖後端" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81 msgid "Visualize" msgstr "視覺化" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:78 msgid "Outline rectangles" msgstr "矩形外框" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:79 msgid "Add wire outlines for all rectangular geometry" msgstr "為所有的矩形位置大小加入線框" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:83 msgid "Show wireframes" msgstr "顯示線框" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:84 msgid "Add wire outlines for all geometry" msgstr "為所有的位置大小加入線框" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127 +#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:178 msgid "Root Cause" msgstr "根本原因" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:88 msgid "Disable Journal batching" msgstr "停用日誌批次" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:89 msgid "Disable batching of geometry in the Cogl Journal." msgstr "停用 Cogl 日誌中位置大小的批次。" -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:93 msgid "Disable GL Vertex Buffers" msgstr "停用 GL 頂端緩衝區" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:94 msgid "Disable use of OpenGL vertex buffer objects" msgstr "停用 OpenGL 頂端緩衝區物件的使用" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:98 msgid "Disable GL Pixel Buffers" msgstr "停用 GL 像素緩衝區" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:99 msgid "Disable use of OpenGL pixel buffer objects" msgstr "停用 OpenGL 像素緩衝區物件的使用" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:103 msgid "Disable software rect transform" msgstr "停用軟件矩形變形" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:104 msgid "Use the GPU to transform rectangular geometry" msgstr "使用 GPU 來轉變矩形位置大小" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:106 msgid "Cogl Specialist" msgstr "Cogl 專家" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:108 msgid "Dump atlas images" msgstr "傾印圖集影像" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:109 msgid "Dump texture atlas changes to an image file" msgstr "將材質圖集更改傾印到影像檔案" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:113 msgid "Disable texture atlasing" msgstr "停用材質圖集" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:114 msgid "Disable use of texture atlasing" msgstr "停用材質圖集的使用" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:118 msgid "Disable sharing the texture atlas between text and images" msgstr "停用在文字與影像間分享材質圖集" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:119 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." -msgstr "" -"當這些設為圖表快取將會永遠為個別材質使用圖集。否則它會嘗試與影像分享圖集。" +msgstr "當這些設為圖表快取將會永遠為個別材質使用圖集。否則它會嘗試與影像分享圖集。" -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:124 msgid "Disable texturing" msgstr "停用材質" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable texturing any primitives" msgstr "停用任何原型的材質" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:129 msgid "Disable arbfp" msgstr "停用 arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:130 msgid "Disable use of ARB fragment programs" msgstr "停用 ARB 片段程式的使用" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:134 msgid "Disable fixed" msgstr "停用修正" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:135 msgid "Disable use of the fixed function pipeline backend" msgstr "停用修正函數導管後端的使用" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:139 msgid "Disable GLSL" msgstr "停用 GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:140 msgid "Disable use of GLSL" msgstr "停用 GLSL的使用" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:144 msgid "Disable blending" msgstr "停用混合" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:145 msgid "Disable use of blending" msgstr "停用混合的使用" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:149 msgid "Disable non-power-of-two textures" msgstr "停用 non-power-of-two 材質" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:150 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." -msgstr "" -"讓 Cogl 認為 GL 驅動程式不支援 NPOT 材質，如此它會建立切割的材質或耗費的材質" -"來代替。" +msgstr "讓 Cogl 認為 GL 驅動程式不支援 NPOT 材質，如此它會建立切割的材質或耗費的材質來代替。" -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:155 msgid "Disable software clipping" msgstr "停用軟件剪裁" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:156 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "停用 Cogl 在軟件中嘗試剪裁某些矩形。" -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:160 msgid "Show source" msgstr "顯示來源" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:161 msgid "Show generated ARBfp/GLSL source code" msgstr "顯示產生的 ARBfp/GLSL 原始碼" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:165 msgid "Trace some OpenGL" msgstr "追蹤某些 OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:166 msgid "Traces some select OpenGL calls" msgstr "追蹤某些選取的 OpenGL 呼叫" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:170 msgid "Trace offscreen support" msgstr "追蹤螢幕外支援" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:171 msgid "Debug offscreen support" msgstr "除錯螢幕外支援" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:175 msgid "Disable program caches" msgstr "停用程式快取" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:176 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "停用 arbfp 和 glsl 程式的後備快取" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:180 msgid "Disable read pixel optimization" msgstr "停用讀取像素最佳化" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:181 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "停用不透明矩形的簡單場景讀取 1px 的最佳化" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:186 msgid "Trace clipping" msgstr "追蹤剪裁" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:187 msgid "Logs information about how Cogl is implementing clipping" msgstr "關於 Cogl 如何實作剪裁的紀錄資訊" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:191 msgid "Trace performance concerns" msgstr "追縱效能重視" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:192 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "嘗試突顯次要最佳化 Cogl 使用率。" + +#~ msgid "Cogl debugging flags to set" +#~ msgstr "準備設定的 Cogl 偵錯旗標" + +#~ msgid "Cogl debugging flags to unset" +#~ msgstr "準備去除的 Cogl 偵錯旗標" + +#~ msgid "Cogl Options" +#~ msgstr "Cogl 選項" + +#~ msgid "Show Cogl options" +#~ msgstr "顯示 Cogl 選項" Binary files /tmp/tmpVdDPF4/NmUHqOeh4n/cogl-1.22.0/po/zh_TW.gmo and /tmp/tmpVdDPF4/MEurdhhGoY/cogl-1.22.2/po/zh_TW.gmo differ diff -Nru cogl-1.22.0/po/zh_TW.po cogl-1.22.2/po/zh_TW.po --- cogl-1.22.0/po/zh_TW.po 2015-09-16 14:13:06.000000000 +0000 +++ cogl-1.22.2/po/zh_TW.po 2016-08-26 16:18:04.000000000 +0000 @@ -7,286 +7,270 @@ msgstr "" "Project-Id-Version: cogl 2.0.0\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=clutter\n" -"POT-Creation-Date: 2015-09-16 15:13+0100\n" +"product=cogl&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2015-07-21 15:15+0000\n" "PO-Revision-Date: 2012-08-02 19:02+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Taiwan) \n" -"Language: \n" +"Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cogl/cogl-debug.c:181 +#: ../cogl/cogl-debug.c:180 msgid "Supported debug values:" msgstr "支援的除錯數值：" -#: cogl/cogl-debug.c:186 +#: ../cogl/cogl-debug.c:185 msgid "Special debug values:" msgstr "特殊的除錯數值：" -#: cogl/cogl-debug.c:188 cogl/cogl-debug.c:190 +#: ../cogl/cogl-debug.c:187 ../cogl/cogl-debug.c:189 msgid "Enables all non-behavioural debug options" msgstr "啟用所有非行為性的除錯選項" -#: cogl/cogl-debug.c:197 +#: ../cogl/cogl-debug.c:196 msgid "Additional environment variables:" msgstr "額外的環境變數：" -#: cogl/cogl-debug.c:198 +#: ../cogl/cogl-debug.c:197 msgid "Comma-separated list of GL extensions to pretend are disabled" msgstr "準備停用的 GL 擴充功能清單 (以逗號分隔)" -#: cogl/cogl-debug.c:200 +#: ../cogl/cogl-debug.c:199 msgid "Override the GL version that Cogl will assume the driver supports" msgstr "覆蓋 Cogl 假設驅動程式會支援的 GL 版本" -#: cogl/cogl-debug.c:244 -msgid "Cogl debugging flags to set" -msgstr "準備設定的 Cogl 偵錯旗標" - -#: cogl/cogl-debug.c:246 -msgid "Cogl debugging flags to unset" -msgstr "準備去除的 Cogl 偵錯旗標" - -#: cogl/cogl-debug.c:295 -msgid "Cogl Options" -msgstr "Cogl 選項" - -#: cogl/cogl-debug.c:296 -msgid "Show Cogl options" -msgstr "顯示 Cogl 選項" - -#: cogl/cogl-debug-options.h:32 cogl/cogl-debug-options.h:37 -#: cogl/cogl-debug-options.h:42 cogl/cogl-debug-options.h:47 -#: cogl/cogl-debug-options.h:52 cogl/cogl-debug-options.h:57 -#: cogl/cogl-debug-options.h:62 cogl/cogl-debug-options.h:68 -#: cogl/cogl-debug-options.h:73 cogl/cogl-debug-options.h:78 -#: cogl/cogl-debug-options.h:165 cogl/cogl-debug-options.h:170 -#: cogl/cogl-debug-options.h:175 cogl/cogl-debug-options.h:191 -#: cogl/cogl-debug-options.h:196 +#: ../cogl/cogl-debug-options.h:32 ../cogl/cogl-debug-options.h:37 +#: ../cogl/cogl-debug-options.h:42 ../cogl/cogl-debug-options.h:47 +#: ../cogl/cogl-debug-options.h:52 ../cogl/cogl-debug-options.h:57 +#: ../cogl/cogl-debug-options.h:62 ../cogl/cogl-debug-options.h:68 +#: ../cogl/cogl-debug-options.h:73 ../cogl/cogl-debug-options.h:78 +#: ../cogl/cogl-debug-options.h:165 ../cogl/cogl-debug-options.h:170 +#: ../cogl/cogl-debug-options.h:175 ../cogl/cogl-debug-options.h:191 +#: ../cogl/cogl-debug-options.h:196 msgid "Cogl Tracing" msgstr "Cogl 追蹤" -#: cogl/cogl-debug-options.h:34 +#: ../cogl/cogl-debug-options.h:34 msgid "CoglObject references" msgstr "CoglObject 參照" -#: cogl/cogl-debug-options.h:35 +#: ../cogl/cogl-debug-options.h:35 msgid "Debug ref counting issues for CoglObjects" msgstr "CoglObjects 的除錯參考持續問題" -#: cogl/cogl-debug-options.h:39 +#: ../cogl/cogl-debug-options.h:39 msgid "Trace Texture Slicing" msgstr "追蹤材質切割" -#: cogl/cogl-debug-options.h:40 +#: ../cogl/cogl-debug-options.h:40 msgid "debug the creation of texture slices" msgstr "材質切割建立的除錯" -#: cogl/cogl-debug-options.h:44 +#: ../cogl/cogl-debug-options.h:44 msgid "Trace Atlas Textures" msgstr "追蹤圖集材質" -#: cogl/cogl-debug-options.h:45 +#: ../cogl/cogl-debug-options.h:45 msgid "Debug texture atlas management" msgstr "除錯材質圖集管理" -#: cogl/cogl-debug-options.h:49 +#: ../cogl/cogl-debug-options.h:49 msgid "Trace Blend Strings" msgstr "追蹤混合字串" -#: cogl/cogl-debug-options.h:50 +#: ../cogl/cogl-debug-options.h:50 msgid "Debug CoglBlendString parsing" msgstr "除錯 CoglBlendString 解析" -#: cogl/cogl-debug-options.h:54 +#: ../cogl/cogl-debug-options.h:54 msgid "Trace Journal" msgstr "追蹤日誌" -#: cogl/cogl-debug-options.h:55 +#: ../cogl/cogl-debug-options.h:55 msgid "View all the geometry passing through the journal" msgstr "檢視所有通過日誌的位置大小" -#: cogl/cogl-debug-options.h:59 +#: ../cogl/cogl-debug-options.h:59 msgid "Trace Batching" msgstr "追蹤批次" -#: cogl/cogl-debug-options.h:60 +#: ../cogl/cogl-debug-options.h:60 msgid "Show how geometry is being batched in the journal" msgstr "顯示日誌中批次的幾何大小如何" -#: cogl/cogl-debug-options.h:64 +#: ../cogl/cogl-debug-options.h:64 msgid "Trace matrices" msgstr "追蹤矩陣" -#: cogl/cogl-debug-options.h:65 +#: ../cogl/cogl-debug-options.h:65 msgid "Trace all matrix manipulation" msgstr "追蹤所有的矩陣操作" -#: cogl/cogl-debug-options.h:70 +#: ../cogl/cogl-debug-options.h:70 msgid "Trace Misc Drawing" msgstr "追蹤雜項繪製" -#: cogl/cogl-debug-options.h:71 +#: ../cogl/cogl-debug-options.h:71 msgid "Trace some misc drawing operations" msgstr "追蹤某些繪製操作" -#: cogl/cogl-debug-options.h:75 +#: ../cogl/cogl-debug-options.h:75 msgid "Trace Pango Renderer" msgstr "追蹤 Pango 繪製器" -#: cogl/cogl-debug-options.h:76 +#: ../cogl/cogl-debug-options.h:76 msgid "Trace the Cogl Pango renderer" msgstr "追蹤 Cogl Pango 繪製器" -#: cogl/cogl-debug-options.h:80 +#: ../cogl/cogl-debug-options.h:80 msgid "Trace CoglTexturePixmap backend" msgstr "追蹤 CoglTexturePixmap 後端" -#: cogl/cogl-debug-options.h:81 +#: ../cogl/cogl-debug-options.h:81 msgid "Trace the Cogl texture pixmap backend" msgstr "追蹤 Cogl Pango 材質點陣圖後端" -#: cogl/cogl-debug-options.h:83 cogl/cogl-debug-options.h:88 +#: ../cogl/cogl-debug-options.h:83 ../cogl/cogl-debug-options.h:88 msgid "Visualize" msgstr "視覺化" -#: cogl/cogl-debug-options.h:85 +#: ../cogl/cogl-debug-options.h:85 msgid "Outline rectangles" msgstr "矩形外框" -#: cogl/cogl-debug-options.h:86 +#: ../cogl/cogl-debug-options.h:86 msgid "Add wire outlines for all rectangular geometry" msgstr "為所有的矩形位置大小加入線框" -#: cogl/cogl-debug-options.h:90 +#: ../cogl/cogl-debug-options.h:90 msgid "Show wireframes" msgstr "顯示線框" -#: cogl/cogl-debug-options.h:91 +#: ../cogl/cogl-debug-options.h:91 msgid "Add wire outlines for all geometry" msgstr "為所有的位置大小加入線框" -#: cogl/cogl-debug-options.h:93 cogl/cogl-debug-options.h:98 -#: cogl/cogl-debug-options.h:103 cogl/cogl-debug-options.h:108 -#: cogl/cogl-debug-options.h:118 cogl/cogl-debug-options.h:123 -#: cogl/cogl-debug-options.h:129 cogl/cogl-debug-options.h:134 -#: cogl/cogl-debug-options.h:139 cogl/cogl-debug-options.h:144 -#: cogl/cogl-debug-options.h:149 cogl/cogl-debug-options.h:154 -#: cogl/cogl-debug-options.h:160 cogl/cogl-debug-options.h:180 -#: cogl/cogl-debug-options.h:185 +#: ../cogl/cogl-debug-options.h:93 ../cogl/cogl-debug-options.h:98 +#: ../cogl/cogl-debug-options.h:103 ../cogl/cogl-debug-options.h:108 +#: ../cogl/cogl-debug-options.h:118 ../cogl/cogl-debug-options.h:123 +#: ../cogl/cogl-debug-options.h:129 ../cogl/cogl-debug-options.h:134 +#: ../cogl/cogl-debug-options.h:139 ../cogl/cogl-debug-options.h:144 +#: ../cogl/cogl-debug-options.h:149 ../cogl/cogl-debug-options.h:154 +#: ../cogl/cogl-debug-options.h:160 ../cogl/cogl-debug-options.h:180 +#: ../cogl/cogl-debug-options.h:185 msgid "Root Cause" msgstr "根本原因" -#: cogl/cogl-debug-options.h:95 +#: ../cogl/cogl-debug-options.h:95 msgid "Disable Journal batching" msgstr "停用日誌批次" -#: cogl/cogl-debug-options.h:96 +#: ../cogl/cogl-debug-options.h:96 msgid "Disable batching of geometry in the Cogl Journal." msgstr "停用 Cogl 日誌中位置大小的批次。" -#: cogl/cogl-debug-options.h:100 +#: ../cogl/cogl-debug-options.h:100 msgid "Disable GL Vertex Buffers" msgstr "停用 GL 頂端緩衝區" -#: cogl/cogl-debug-options.h:101 +#: ../cogl/cogl-debug-options.h:101 msgid "Disable use of OpenGL vertex buffer objects" msgstr "停用 OpenGL 頂端緩衝區物件的使用" -#: cogl/cogl-debug-options.h:105 +#: ../cogl/cogl-debug-options.h:105 msgid "Disable GL Pixel Buffers" msgstr "停用 GL 像素緩衝區" -#: cogl/cogl-debug-options.h:106 +#: ../cogl/cogl-debug-options.h:106 msgid "Disable use of OpenGL pixel buffer objects" msgstr "停用 OpenGL 像素緩衝區物件的使用" -#: cogl/cogl-debug-options.h:110 +#: ../cogl/cogl-debug-options.h:110 msgid "Disable software rect transform" msgstr "停用軟體矩形變形" -#: cogl/cogl-debug-options.h:111 +#: ../cogl/cogl-debug-options.h:111 msgid "Use the GPU to transform rectangular geometry" msgstr "使用 GPU 來轉變矩形位置大小" -#: cogl/cogl-debug-options.h:113 +#: ../cogl/cogl-debug-options.h:113 msgid "Cogl Specialist" msgstr "Cogl 專家" -#: cogl/cogl-debug-options.h:115 +#: ../cogl/cogl-debug-options.h:115 msgid "Dump atlas images" msgstr "傾印圖集影像" -#: cogl/cogl-debug-options.h:116 +#: ../cogl/cogl-debug-options.h:116 msgid "Dump texture atlas changes to an image file" msgstr "將材質圖集變更傾印到影像檔案" -#: cogl/cogl-debug-options.h:120 +#: ../cogl/cogl-debug-options.h:120 msgid "Disable texture atlasing" msgstr "停用材質圖集" -#: cogl/cogl-debug-options.h:121 +#: ../cogl/cogl-debug-options.h:121 msgid "Disable use of texture atlasing" msgstr "停用材質圖集的使用" -#: cogl/cogl-debug-options.h:125 +#: ../cogl/cogl-debug-options.h:125 msgid "Disable sharing the texture atlas between text and images" msgstr "停用在文字與影像間分享材質圖集" -#: cogl/cogl-debug-options.h:126 +#: ../cogl/cogl-debug-options.h:126 msgid "" "When this is set the glyph cache will always use a separate texture for its " "atlas. Otherwise it will try to share the atlas with images." msgstr "" "當這些設為圖表快取將會永遠為個別材質使用圖集。否則它會嘗試與影像分享圖集。" -#: cogl/cogl-debug-options.h:131 +#: ../cogl/cogl-debug-options.h:131 msgid "Disable texturing" msgstr "停用材質" -#: cogl/cogl-debug-options.h:132 +#: ../cogl/cogl-debug-options.h:132 msgid "Disable texturing any primitives" msgstr "停用任何原型的材質" -#: cogl/cogl-debug-options.h:136 +#: ../cogl/cogl-debug-options.h:136 msgid "Disable arbfp" msgstr "停用 arbfp" -#: cogl/cogl-debug-options.h:137 +#: ../cogl/cogl-debug-options.h:137 msgid "Disable use of ARB fragment programs" msgstr "停用 ARB 片段程式的使用" -#: cogl/cogl-debug-options.h:141 +#: ../cogl/cogl-debug-options.h:141 msgid "Disable fixed" msgstr "停用修正" -#: cogl/cogl-debug-options.h:142 +#: ../cogl/cogl-debug-options.h:142 msgid "Disable use of the fixed function pipeline backend" msgstr "停用修正函式導管後端的使用" -#: cogl/cogl-debug-options.h:146 +#: ../cogl/cogl-debug-options.h:146 msgid "Disable GLSL" msgstr "停用 GLSL" -#: cogl/cogl-debug-options.h:147 +#: ../cogl/cogl-debug-options.h:147 msgid "Disable use of GLSL" msgstr "停用 GLSL的使用" -#: cogl/cogl-debug-options.h:151 +#: ../cogl/cogl-debug-options.h:151 msgid "Disable blending" msgstr "停用混合" -#: cogl/cogl-debug-options.h:152 +#: ../cogl/cogl-debug-options.h:152 msgid "Disable use of blending" msgstr "停用混合的使用" -#: cogl/cogl-debug-options.h:156 +#: ../cogl/cogl-debug-options.h:156 msgid "Disable non-power-of-two textures" msgstr "停用 non-power-of-two 材質" -#: cogl/cogl-debug-options.h:157 +#: ../cogl/cogl-debug-options.h:157 msgid "" "Makes Cogl think that the GL driver doesn't support NPOT textures so that it " "will create sliced textures or textures with waste instead." @@ -294,67 +278,79 @@ "讓 Cogl 認為 GL 驅動程式不支援 NPOT 材質，如此它會建立切割的材質或耗費的材質" "來代替。" -#: cogl/cogl-debug-options.h:162 +#: ../cogl/cogl-debug-options.h:162 msgid "Disable software clipping" msgstr "停用軟體剪裁" -#: cogl/cogl-debug-options.h:163 +#: ../cogl/cogl-debug-options.h:163 msgid "Disables Cogl's attempts to clip some rectangles in software." msgstr "停用 Cogl 在軟體中嘗試剪裁某些矩形。" -#: cogl/cogl-debug-options.h:167 +#: ../cogl/cogl-debug-options.h:167 msgid "Show source" msgstr "顯示來源" -#: cogl/cogl-debug-options.h:168 +#: ../cogl/cogl-debug-options.h:168 msgid "Show generated ARBfp/GLSL source code" msgstr "顯示產生的 ARBfp/GLSL 源碼" -#: cogl/cogl-debug-options.h:172 +#: ../cogl/cogl-debug-options.h:172 msgid "Trace some OpenGL" msgstr "追蹤某些 OpenGL" -#: cogl/cogl-debug-options.h:173 +#: ../cogl/cogl-debug-options.h:173 msgid "Traces some select OpenGL calls" msgstr "追蹤某些選取的 OpenGL 呼叫" -#: cogl/cogl-debug-options.h:177 +#: ../cogl/cogl-debug-options.h:177 msgid "Trace offscreen support" msgstr "追蹤螢幕外支援" -#: cogl/cogl-debug-options.h:178 +#: ../cogl/cogl-debug-options.h:178 msgid "Debug offscreen support" msgstr "除錯螢幕外支援" -#: cogl/cogl-debug-options.h:182 +#: ../cogl/cogl-debug-options.h:182 msgid "Disable program caches" msgstr "停用程式快取" -#: cogl/cogl-debug-options.h:183 +#: ../cogl/cogl-debug-options.h:183 msgid "Disable fallback caches for arbfp and glsl programs" msgstr "停用 arbfp 和 glsl 程式的後備快取" -#: cogl/cogl-debug-options.h:187 +#: ../cogl/cogl-debug-options.h:187 msgid "Disable read pixel optimization" msgstr "停用讀取像素最佳化" -#: cogl/cogl-debug-options.h:188 +#: ../cogl/cogl-debug-options.h:188 msgid "" "Disable optimization for reading 1px for simple scenes of opaque rectangles" msgstr "停用不透明矩形的簡單場景讀取 1px 的最佳化" -#: cogl/cogl-debug-options.h:193 +#: ../cogl/cogl-debug-options.h:193 msgid "Trace clipping" msgstr "追蹤剪裁" -#: cogl/cogl-debug-options.h:194 +#: ../cogl/cogl-debug-options.h:194 msgid "Logs information about how Cogl is implementing clipping" msgstr "關於 Cogl 如何實作剪裁的紀錄資訊" -#: cogl/cogl-debug-options.h:198 +#: ../cogl/cogl-debug-options.h:198 msgid "Trace performance concerns" msgstr "追縱效能重視" -#: cogl/cogl-debug-options.h:199 +#: ../cogl/cogl-debug-options.h:199 msgid "Tries to highlight sub-optimal Cogl usage." msgstr "嘗試突顯次要最佳化 Cogl 使用率。" + +#~ msgid "Cogl debugging flags to set" +#~ msgstr "準備設定的 Cogl 偵錯旗標" + +#~ msgid "Cogl debugging flags to unset" +#~ msgstr "準備去除的 Cogl 偵錯旗標" + +#~ msgid "Cogl Options" +#~ msgstr "Cogl 選項" + +#~ msgid "Show Cogl options" +#~ msgstr "顯示 Cogl 選項" diff -Nru cogl-1.22.0/test-fixtures/Makefile.in cogl-1.22.2/test-fixtures/Makefile.in --- cogl-1.22.0/test-fixtures/Makefile.in 2015-09-16 14:00:52.000000000 +0000 +++ cogl-1.22.2/test-fixtures/Makefile.in 2016-08-26 17:34:00.000000000 +0000 @@ -337,6 +337,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru cogl-1.22.0/tests/conform/Makefile.in cogl-1.22.2/tests/conform/Makefile.in --- cogl-1.22.0/tests/conform/Makefile.in 2015-09-16 14:00:52.000000000 +0000 +++ cogl-1.22.2/tests/conform/Makefile.in 2016-08-26 17:34:00.000000000 +0000 @@ -460,6 +460,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru cogl-1.22.0/tests/conform/test-conform-main.c cogl-1.22.2/tests/conform/test-conform-main.c --- cogl-1.22.0/tests/conform/test-conform-main.c 2015-08-19 18:00:03.000000000 +0000 +++ cogl-1.22.2/tests/conform/test-conform-main.c 2016-08-26 17:23:46.000000000 +0000 @@ -76,7 +76,9 @@ ADD_TEST (test_pixel_buffer_set_data, 0, 0); ADD_TEST (test_pixel_buffer_sub_region, 0, 0); UNPORTED_TEST (test_texture_rectangle); - ADD_TEST (test_texture_3d, TEST_REQUIREMENT_TEXTURE_3D, 0); + ADD_TEST (test_texture_3d, + TEST_REQUIREMENT_GL | TEST_REQUIREMENT_TEXTURE_3D, + 0); ADD_TEST (test_wrap_modes, 0, 0); UNPORTED_TEST (test_texture_pixmap_x11); ADD_TEST (test_texture_get_set_data, 0, 0); diff -Nru cogl-1.22.0/tests/data/Makefile.in cogl-1.22.2/tests/data/Makefile.in --- cogl-1.22.0/tests/data/Makefile.in 2015-09-16 14:00:52.000000000 +0000 +++ cogl-1.22.2/tests/data/Makefile.in 2016-08-26 17:34:00.000000000 +0000 @@ -283,6 +283,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru cogl-1.22.0/tests/Makefile.in cogl-1.22.2/tests/Makefile.in --- cogl-1.22.0/tests/Makefile.in 2015-09-16 14:00:52.000000000 +0000 +++ cogl-1.22.2/tests/Makefile.in 2016-08-26 17:34:00.000000000 +0000 @@ -376,6 +376,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru cogl-1.22.0/tests/micro-perf/Makefile.in cogl-1.22.2/tests/micro-perf/Makefile.in --- cogl-1.22.0/tests/micro-perf/Makefile.in 2015-09-16 14:00:52.000000000 +0000 +++ cogl-1.22.2/tests/micro-perf/Makefile.in 2016-08-26 17:34:00.000000000 +0000 @@ -342,6 +342,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff -Nru cogl-1.22.0/tests/unit/Makefile.in cogl-1.22.2/tests/unit/Makefile.in --- cogl-1.22.0/tests/unit/Makefile.in 2015-09-16 14:00:52.000000000 +0000 +++ cogl-1.22.2/tests/unit/Makefile.in 2016-08-26 17:34:00.000000000 +0000 @@ -345,6 +345,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@