November 2016 - openSUSE Commits - openSUSE Mailing Lists

commit cinnamon-desktop for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '16

28 Nov '16

Hello community, here is the log from the commit of package cinnamon-desktop for openSUSE:Factory checked in at 2016-11-28 15:06:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon-desktop (Old) and /work/SRC/openSUSE:Factory/.cinnamon-desktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cinnamon-desktop" Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon-desktop/cinnamon-desktop.changes 2016-11-15 18:01:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cinnamon-desktop.new/cinnamon-desktop.changes 2016-11-28 15:06:57.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Nov 24 10:25:32 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to version 3.2.1: + * Update PAM for Fedora selinux + * Fix includes for libcvc + * Port some PAM code from cinnamon-screensaver 3.0: + - Don't check return value of pam_acct_mgmt. + On some systems it can fail because account modules are not + configured properly or because this check requires + additional privileges. + - Call pam_setcred() to refresh credentials. +- Rebase cinnamon-desktop-suse-pam.patch. + +------------------------------------------------------------------- Old: ---- cinnamon-desktop-3.2.0.tar.gz New: ---- cinnamon-desktop-3.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon-desktop.spec ++++++ --- /var/tmp/diff_new_pack.Pp8atb/_old 2016-11-28 15:06:58.000000000 +0100 +++ /var/tmp/diff_new_pack.Pp8atb/_new 2016-11-28 15:06:58.000000000 +0100 @@ -23,7 +23,7 @@ %define typelib typelib-1_0-CinnamonDesktop-3_0 %define typelib_cvc typelib-1_0-Cvc-1_0 Name: cinnamon-desktop -Version: 3.2.0 +Version: 3.2.1 Release: 0 Summary: Libcinnamon-desktop API License: GPL-2.0+ and MIT ++++++ cinnamon-desktop-3.2.0.tar.gz -> cinnamon-desktop-3.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-desktop-3.2.0/configure.ac new/cinnamon-desktop-3.2.1/configure.ac --- old/cinnamon-desktop-3.2.0/configure.ac 2016-11-07 11:33:02.000000000 +0100 +++ new/cinnamon-desktop-3.2.1/configure.ac 2016-11-23 13:43:49.000000000 +0100 @@ -1,5 +1,5 @@ -AC_INIT(cinnamon-desktop, 3.2.0) +AC_INIT(cinnamon-desktop, 3.2.1) m4_ifdef([AX_IS_RELEASE], [AX_IS_RELEASE([always])]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-desktop-3.2.0/data/cinnamon-desktop new/cinnamon-desktop-3.2.1/data/cinnamon-desktop --- old/cinnamon-desktop-3.2.0/data/cinnamon-desktop 2016-11-07 11:33:02.000000000 +0100 +++ new/cinnamon-desktop-3.2.1/data/cinnamon-desktop 2016-11-23 13:43:49.000000000 +0100 @@ -1,11 +1,12 @@ #%PAM-1.0 # Fedora Core +auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +session include system-auth auth include system-auth auth optional pam_gnome_keyring.so account include system-auth password include system-auth -session include system-auth # SuSE/Novell #auth include common-auth diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-desktop-3.2.0/debian/changelog new/cinnamon-desktop-3.2.1/debian/changelog --- old/cinnamon-desktop-3.2.0/debian/changelog 2016-11-07 11:33:02.000000000 +0100 +++ new/cinnamon-desktop-3.2.1/debian/changelog 2016-11-23 13:43:49.000000000 +0100 @@ -1,3 +1,14 @@ +cinnamon-desktop (3.2.1) serena; urgency=medium + + [ leigh123linux ] + * Update PAM for Fedora selinux + * Fix includes for libcvc + + [ Didenko Vladimir ] + * Port some PAM code from cinnamon-screensaver 3.0: 1) Don't check return value of pam_acct_mgmt. On some systems it can fail because account modules are not configured properly or because this check requires additional privileges; 2) Call pam_setcred() to refresh credentials + + -- Clement Lefebvre <root(a)linuxmint.com> Wed, 23 Nov 2016 12:43:16 +0000 + cinnamon-desktop (3.2.0) serena; urgency=medium [ brownsr ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-desktop-3.2.0/libcinnamon-desktop/gnome-desktop-utils.c new/cinnamon-desktop-3.2.1/libcinnamon-desktop/gnome-desktop-utils.c --- old/cinnamon-desktop-3.2.0/libcinnamon-desktop/gnome-desktop-utils.c 2016-11-07 11:33:02.000000000 +0100 +++ new/cinnamon-desktop-3.2.1/libcinnamon-desktop/gnome-desktop-utils.c 2016-11-23 13:43:49.000000000 +0100 @@ -385,8 +385,30 @@ if (retval == PAM_SUCCESS) retval = pam_authenticate (pamh, 0); - if (retval == PAM_SUCCESS) - retval = pam_acct_mgmt (pamh, 0); + if (retval == PAM_SUCCESS) { + /** + * On most systems, it doesn't matter whether the account modules + * are run, or whether they fail or succeed. + + * On some systems, the account modules fail, because they were + * never configured properly, but it's necessary to run them anyway + * because certain PAM modules depend on side effects of the account + * modules having been run. + **/ + pam_acct_mgmt (pamh, 0); + + /** + * Each time we successfully authenticate, refresh credentials, + * for Kerberos/AFS/DCE/etc. If this fails, just ignore that + * failure and blunder along; it shouldn't matter. + + * Note: this used to be PAM_REFRESH_CRED instead of + * PAM_REINITIALIZE_CRED, but Jason Heiss <jheiss(a)ee.washington.edu> + * says that the Linux PAM library ignores that one, and only refreshes + * credentials when using PAM_REINITIALIZE_CRED. + **/ + pam_setcred (pamh, PAM_REINITIALIZE_CRED); + } ret = (retval == PAM_SUCCESS); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-desktop-3.2.0/libcvc/cvc.pc.in new/cinnamon-desktop-3.2.1/libcvc/cvc.pc.in --- old/cinnamon-desktop-3.2.0/libcvc/cvc.pc.in 2016-11-07 11:33:02.000000000 +0100 +++ new/cinnamon-desktop-3.2.1/libcvc/cvc.pc.in 2016-11-23 13:43:49.000000000 +0100 @@ -8,4 +8,4 @@ Requires: gio-2.0 libpulse libpulse-mainloop-glib gobject-2.0 Version: @VERSION@ Libs: -L${libdir} -lcvc -Cflags: -I${includedir}/cvc +Cflags: -I${includedir}/cinnamon-desktop/libcvc ++++++ cinnamon-desktop-suse-pam.patch ++++++ --- /var/tmp/diff_new_pack.Pp8atb/_old 2016-11-28 15:06:58.000000000 +0100 +++ /var/tmp/diff_new_pack.Pp8atb/_new 2016-11-28 15:06:58.000000000 +0100 @@ -1,19 +1,21 @@ --- a/data/cinnamon-desktop +++ b/data/cinnamon-desktop -@@ -1,15 +1,15 @@ +@@ -1,16 +1,16 @@ #%PAM-1.0 # Fedora Core +-auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +-session include system-auth -auth include system-auth -auth optional pam_gnome_keyring.so -account include system-auth -password include system-auth --session include system-auth ++#auth [success=done ignore=ignore default=bad] pam_selinux_permit.so ++#session include system-auth +#auth include system-auth +#auth optional pam_gnome_keyring.so +#account include system-auth +#password include system-auth -+#session include system-auth # SuSE/Novell -#auth include common-auth

1 0

commit cinnamon for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '16

28 Nov '16

Hello community, here is the log from the commit of package cinnamon for openSUSE:Factory checked in at 2016-11-28 15:06:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon (Old) and /work/SRC/openSUSE:Factory/.cinnamon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cinnamon" Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon/cinnamon.changes 2016-11-15 18:00:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cinnamon.new/cinnamon.changes 2016-11-28 15:06:50.000000000 +0100 @@ -1,0 +2,33 @@ +Thu Nov 24 10:25:32 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to version 3.2.2: + * build: Make AX_ macros optional. + * [Xlet settings] Fix for icon choosers stuck dialogues. + * [cinnamon-json-makepot] Add support for "title" key. + * Ensure a default icon size of 16px if the icon-size is not set + in the indicator icon theme class. + * [workspace-switcher] Fix buttons' size Buttons didn't get + proper height (or width in vertical mode) if the auto-scale + font setting was not enabled. + * Restore the ability to theme the menu applet menu separately + from other menus. + * cs_effects: Disable menu animations when turning of window + effects. + * [applet.js] Re add ability to display a separator on applets + context menus. + * [applet.js] Add a mechanism to highlight applets with open + menus. + * [menu-applet] Fix keynav issues with TAB and right. + * Use the Gio library for establish the file permissions in + replace of the spawnCommandLine usage. + * panel-launchers: Close the menu before destroying when removing + a launcher. + * [Xlet settings] Add a translation mechanism to xlets settings + windows. + * cs_backgrounds.py: Fix thumb generation on Debian Jessie. + * [sound-applet] Remove a show percentage label for slider option. + * theme: Fix theming of the workspace switcher. +- Rebase cinnamon-no-gksu-requirement.patch. +- Remove cinnamon-optional-ax-macros.patch: fixed upstream. + +------------------------------------------------------------------- Old: ---- cinnamon-3.2.1.tar.gz cinnamon-optional-ax-macros.patch New: ---- cinnamon-3.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon.spec ++++++ --- /var/tmp/diff_new_pack.nKAE7D/_old 2016-11-28 15:06:52.000000000 +0100 +++ /var/tmp/diff_new_pack.nKAE7D/_new 2016-11-28 15:06:52.000000000 +0100 @@ -21,7 +21,7 @@ %define _name Cinnamon %define _version 3.2.0 Name: cinnamon -Version: 3.2.1 +Version: 3.2.2 Release: 0 Summary: GNU/Linux Desktop featuring a traditional layout License: GPL-2.0+ and LGPL-2.1 @@ -46,8 +46,6 @@ Patch6: %{name}-fix-typelib-false-positive.patch # PATCH-FEATURE-OPENSUSE cinnamon-fallback-icewm.patch sor.alexei(a)meowr.ru -- Use IceWM as fallback. Patch7: %{name}-fallback-icewm.patch -# PATCH-FIX-UPSTREAM cinnamon-optional-ax-macros.patch -- Make AX_ macros optional (commit 023c17f). -Patch8: %{name}-optional-ax-macros.patch BuildRequires: autoconf BuildRequires: autoconf-archive BuildRequires: automake @@ -184,7 +182,6 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 cp -a %{SOURCE1} . %build ++++++ cinnamon-3.2.1.tar.gz -> cinnamon-3.2.2.tar.gz ++++++ ++++ 2157 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Cinnamon-3.2.1/configure.ac new/Cinnamon-3.2.2/configure.ac --- old/Cinnamon-3.2.1/configure.ac 2016-11-08 15:27:01.000000000 +0100 +++ new/Cinnamon-3.2.2/configure.ac 2016-11-23 14:03:02.000000000 +0100 @@ -1,12 +1,12 @@ AC_PREREQ(2.63) -AC_INIT([cinnamon],[3.2.1],[https://github.com/linuxmint/Cinnamon/issues],[cinnamon]) +AC_INIT([cinnamon],[3.2.2],[https://github.com/linuxmint/Cinnamon/issues],[cinnamon]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([src/cinnamon-global.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([config]) -AX_IS_RELEASE([always]) +m4_ifdef([AX_IS_RELEASE], [AX_IS_RELEASE([always])]) AC_SUBST([PACKAGE_NAME], ["$PACKAGE_NAME"]) AC_SUBST([PACKAGE_VERSION], ["$PACKAGE_VERSION"]) @@ -161,7 +161,8 @@ TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" AC_SUBST(TYPELIBDIR) -AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS]) +m4_ifdef([AX_COMPILER_FLAGS], + [AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])]) AC_ARG_ENABLE(jhbuild-wrapper-script, AS_HELP_STRING([--jhbuild-wrapper-script=yes],[Make "cinnamon" script work for jhbuild]),,enable_jhbuild_wrapper_script=no) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Cinnamon-3.2.1/data/theme/cinnamon.css new/Cinnamon-3.2.2/data/theme/cinnamon.css --- old/Cinnamon-3.2.1/data/theme/cinnamon.css 2016-11-08 15:27:01.000000000 +0100 +++ new/Cinnamon-3.2.2/data/theme/cinnamon.css 2016-11-23 14:03:02.000000000 +0100 @@ -1,6 +1,6 @@ /* ################################################################### * Section common with Gnome Shell - * ... contains a few cinnamon specific styles (rare occurrences) + * ... contains a few cinnamon specific styles (rare occurrences) * ###################################################################*/ stage { font-family: sans, sans-serif; @@ -78,10 +78,10 @@ text-align: center; } /* =================================================================== - * Shared button properties + * Shared button properties * ===================================================================*/ .notification-button, .notification-icon-button, -.modal-dialog-button, +.modal-dialog-button, .sound-player-overlay StButton { color: white; border: 1px solid #8b8b8b; @@ -108,7 +108,7 @@ background-gradient-end: rgba(255, 255, 255, 0.2); } /* =================================================================== - * PopupMenu (popupMenu.js) + * PopupMenu (popupMenu.js) * ===================================================================*/ /* .popup-menu-boxpointer and .popup-menu are kept for compatibility with cinnamon version under 3.2. Use .menu in version 3.2 and above */ @@ -382,7 +382,7 @@ .panel-button:active, .panel-button:overview, .panel-button:focus { - + } .panel-button:active > .system-status-icon, .panel-button:checked > .system-status-icon, @@ -398,7 +398,7 @@ icon-size: 1.14em; } /* =================================================================== - * Overview + * Overview * ===================================================================*/ #overview { spacing: 12px; @@ -515,7 +515,7 @@ } /* =================================================================== - * Looking Glass + * Looking Glass * ===================================================================*/ #LookingGlassDialog { background-color: rgba(85,85,85,0.85); @@ -526,7 +526,7 @@ color: #CCCCCC; } /* =================================================================== - * Date applet + * Date applet * ===================================================================*/ .calendar { padding: .4em 1.75em; @@ -868,7 +868,7 @@ padding-top: 15px; spacing: 5px; } -.run-dialog-completion-box { +.run-dialog-completion-box { padding-left: 15px; font-size: 10px; } @@ -1019,7 +1019,7 @@ -boxpointer-gap: 5px; } /* ################################################################### - * Cinnamon Specific Section + * Cinnamon Specific Section * ###################################################################*/ /* =================================================================== * Menu (menu.js) @@ -1105,10 +1105,10 @@ /* This style is used in menu application buttons for applications which were newly installed */ font-weight: bold; } -.menu-application-button-label:ltr { +.menu-application-button-label:ltr { padding-left: 5px; } -.menu-application-button-label:rtl { +.menu-application-button-label:rtl { padding-right: 5px; } .menu-category-button { @@ -1246,14 +1246,14 @@ } .window-list-item-box:active, .window-list-item-box:checked, -.window-list-item-box:focus { +.window-list-item-box:focus { background-gradient-direction: vertical; background-gradient-start: rgba(226,226,226,0.5); background-gradient-end: rgba(122,122,122,0.5); box-shadow: inset 0px 0px 1px 1px rgba(170,170,170,0.5); border-radius: 2px 2px 0px 0px; } -.window-list-item-box:hover { +.window-list-item-box:hover { box-shadow: inset 0px 0px 1px 1px rgba(170,170,170,1.0); border-radius: 2px 2px 0px 0px; } @@ -1339,23 +1339,29 @@ * Workspace Switcher applet (workspaceSwitcher.js) * ===================================================================*/ /* Controls the styling when using the "Simple buttons" option */ -.workspace-switcher { +.panel-top .workspace-switcher, +.panel-bottom .workspace-switcher { padding-left: 3px; padding-right: 3px; } +.panel-left .workspace-switcher +.panel-right .workspace-switcher { + padding-top: 3px; + padding-bottom: 3px; +} + .workspace-button { width: 20px; height: 10px; color: #cccccc; border: 1px; border-color: #a6a6a6; - padding: 2px; + padding-top: 2px; transition-duration: 300; } .workspace-button:outlined { - padding: 1px; background: #cccccc; color: #555555; box-shadow: inset 0px 0px 8px 1px rgba(255,255,255, 0.7); @@ -1493,7 +1499,7 @@ background-image: url("overview-hover.png"); } /* =================================================================== - * Applets (applet.js) + * Applets (applet.js) * ===================================================================*/ .applet-separator { padding: 5px 4px; @@ -1527,9 +1533,9 @@ .applet-box:highlight { background-color: #aa5555; } -.applet-label { +.applet-label { font-weight: bold; - color: #ccc; + color: #ccc; } .applet-box:hover > .applet-label { color: #fff; @@ -1548,10 +1554,10 @@ .applet-box.vertical:hover .applet-icon { } /* =================================================================== - * Desklets (desklet.js) + * Desklets (desklet.js) * ===================================================================*/ -.desklet { - color: #fff; +.desklet { + color: #fff; } .desklet:highlight, .desklet:highlight-with-borders, .desklet:highlight-with-borders-and-header { @@ -1577,7 +1583,7 @@ border-radius-bottomright: 12px; } -.desklet-header { +.desklet-header { border-radius-topleft: 12px; border-radius-topright: 12px; font-size: 10.5pt; @@ -1588,7 +1594,7 @@ padding: 6px; } -.desklet-drag-placeholder { +.desklet-drag-placeholder { border: 2px solid #6daa00; background-color: rgba(109,170, 0, 0.3); } @@ -1635,7 +1641,7 @@ /* =================================================================== - * Clock Desklet (desklet.js) + * Clock Desklet (desklet.js) * ===================================================================*/ .clock-desklet-label { } @@ -1648,7 +1654,7 @@ color: #ffffff; text-shadow: black 5px 5px 5px; font-weight: bold; - font-size: 48pt; + font-size: 48pt; } .expo-workspaces-name-entry { @@ -1663,9 +1669,9 @@ caret-color: rgb(128, 128, 128); caret-size: 1px; width: 250px; - height: 15px; + height: 15px; box-shadow: inset 0px 2px 4px rgba(0,0,0,0.6); - text-align: center; + text-align: center; } .expo-workspaces-name-entry#selected { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Cinnamon-3.2.1/debian/changelog new/Cinnamon-3.2.2/debian/changelog --- old/Cinnamon-3.2.1/debian/changelog 2016-11-08 15:27:01.000000000 +0100 +++ new/Cinnamon-3.2.2/debian/changelog 2016-11-23 14:03:02.000000000 +0100 @@ -1,3 +1,61 @@ +cinnamon (3.2.2) serena; urgency=medium + + [ Clement Lefebvre ] + * build: Make AX_ macros optional + + [ Odyseus ] + * [Xlet settings] Fix for icon choosers stuck dialogs + * [cinnamon-json-makepot] Added support for "title" key + + [ lestcape ] + * Ensure a default icon size of 16px if the icon-size is not set in the indicator icon theme class. + + [ Germán Franco ] + * [workspace-switcher] Fix buttons' size Buttons didn't get proper height (or width in vertical mode) if the auto-scale font setting was not enabled. + + [ NikoKrause ] + * [sound-applet] removed ancient code for timeLabel + * uniform names + + [ Stephen Collins ] + * Restore ability to theme the menu applet menu separately from other menus + + [ JosephMcc ] + * cs_effects: Disable menu animations when turning of window effects + + [ Odyseus ] + * [applet.js] Re added ability to display a separator on applets context menus. + * [applet.js] Added a mechanism to highlight applets with open menus. + + [ NikoKrause ] + * [menu-applet] fix keynav issues with TAB and right + + [ lestcape ] + * Use the Gio library for establish the file permissions in replace of the spawnCommandLine usage. + + [ itzexor ] + * panel-launchers: close the menu before destroying when removing launcher + + [ Odyseus ] + * [Xlet settings] Added translation mechanism to xlets settings windows + + [ itzexor ] + * cs_backgrounds.py: fix thumb generation on LMDE2 + + [ NikoKrause ] + * [sound-applet] remove show percentage label for slider option + + [ JosephMcc ] + * theme: Fix theming of the workspace switcher + + [ NikoKrause ] + * typo + + [ Clement Lefebvre ] + * l10n: Update POT file + + -- Clement Lefebvre <root(a)linuxmint.com> Wed, 23 Nov 2016 13:02:10 +0000 + cinnamon (3.2.1) serena; urgency=medium [ kloun ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Cinnamon-3.2.1/files/usr/share/cinnamon/applets/menu(a)cinnamon.org/applet.js new/Cinnamon-3.2.2/files/usr/share/cinnamon/applets/menu(a)cinnamon.org/applet.js --- old/Cinnamon-3.2.1/files/usr/share/cinnamon/applets/menu(a)cinnamon.org/applet.js 2016-11-08 15:27:01.000000000 +0100 +++ new/Cinnamon-3.2.2/files/usr/share/cinnamon/applets/menu(a)cinnamon.org/applet.js 2016-11-23 14:03:02.000000000 +0100 @@ -142,8 +142,7 @@ let destFile = Gio.file_new_for_path(USER_DESKTOP_PATH+"/"+this._appButton.app.get_id()); try{ file.copy(destFile, 0, null, function(){}); - // Need to find a way to do that using the Gio library, but modifying the access::can-execute attribute on the file object seems unsupported - Util.spawnCommandLine("chmod +x \""+USER_DESKTOP_PATH+"/"+this._appButton.app.get_id()+"\""); + FileUtils.changeModeGFile(destFile, 755); }catch(e){ global.log(e); } @@ -1150,7 +1149,7 @@ this.settings.bind("activate-on-hover", "activateOnHover", this._updateActivateOnHover); this._updateActivateOnHover(); - this.menu.actor.add_style_class_name('menu-background'); + this.menu.setCustomStyleClass('menu-background'); this.menu.connect('open-state-changed', Lang.bind(this, this._onOpenStateChanged)); this.settings.bind("menu-icon-custom", "menuIconCustom", this._updateIconAndLabel); @@ -1624,8 +1623,8 @@ whichWay = "right"; if (this._activeContainer === this.applicationsBox) whichWay = "none"; - else if ((this.categoriesBox.get_child_at_index(index))._delegate instanceof RecentCategoryButton && - this.noRecentDocuments) + else if (this._activeContainer === this.categoriesBox && this.noRecentDocuments && + (this.categoriesBox.get_child_at_index(index))._delegate instanceof RecentCategoryButton) whichWay = "none"; break; case Clutter.KEY_Left: @@ -1715,6 +1714,8 @@ if(this.favBoxShow) { this._previousSelectedActor = this.categoriesBox.get_child_at_index(index); item_actor = this.favBoxIter.getFirstVisible(); + } else { + item_actor = this.categoriesBox.get_child_at_index(index); } } else { @@ -1728,9 +1729,14 @@ this._previousSelectedActor = this.categoriesBox.get_child_at_index(index); item_actor = this.favBoxIter.getFirstVisible(); } else { - item_actor = (this._previousVisibleIndex != null) ? - this.appBoxIter.getVisibleItem(this._previousVisibleIndex) : - this.appBoxIter.getFirstVisible(); + if ((this.categoriesBox.get_child_at_index(index))._delegate instanceof RecentCategoryButton && + this.noRecentDocuments) { + item_actor = this.categoriesBox.get_child_at_index(index); + } else { + item_actor = (this._previousVisibleIndex != null) ? + this.appBoxIter.getVisibleItem(this._previousVisibleIndex) : + this.appBoxIter.getFirstVisible(); + } } break; case "top": diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Cinnamon-3.2.1/files/usr/share/cinnamon/applets/panel-launchers(a)cinnamon.org/applet.js new/Cinnamon-3.2.2/files/usr/share/cinnamon/applets/panel-launchers(a)cinnamon.org/applet.js --- old/Cinnamon-3.2.1/files/usr/share/cinnamon/applets/panel-launchers(a)cinnamon.org/applet.js 2016-11-08 15:27:01.000000000 +0100 +++ new/Cinnamon-3.2.2/files/usr/share/cinnamon/applets/panel-launchers(a)cinnamon.org/applet.js 2016-11-23 14:03:02.000000000 +0100 @@ -95,6 +95,7 @@ }, _onRemoveActivate: function(item, event) { + this.close(); this._launcher.launchersBox.removeLauncher(this._launcher, this._launcher.isCustom()); this._launcher.actor.destroy(); }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Cinnamon-3.2.1/files/usr/share/cinnamon/applets/sound(a)cinnamon.org/applet.js new/Cinnamon-3.2.2/files/usr/share/cinnamon/applets/sound(a)cinnamon.org/applet.js --- old/Cinnamon-3.2.1/files/usr/share/cinnamon/applets/sound(a)cinnamon.org/applet.js 2016-11-08 15:27:01.000000000 +0100 +++ new/Cinnamon-3.2.2/files/usr/share/cinnamon/applets/sound(a)cinnamon.org/applet.js 2016-11-23 14:03:02.000000000 +0100 @@ -35,15 +35,6 @@ const ICON_SIZE = 28; -function _getDigitWidth(actor){ - let context = actor.get_pango_context(); - let themeNode = actor.get_theme_node(); - let font = themeNode.get_font(); - let metrics = context.get_metrics(font, context.get_language()); - let width = metrics.get_approximate_digit_width(); - return width; -} - function ControlButton() { this._init.apply(this, arguments); } @@ -121,19 +112,9 @@ this.addActor(this.icon, {span: 0}); this.addActor(this._slider, {span: -1, expand: true}); - this.label = new St.Label({ text: "" }); - this.label.clutter_text.set_ellipsize(Pango.EllipsizeMode.NONE); - - this.actor.connect('style-changed', Lang.bind(this, this.onStyleChanged)); - this.connectWithStream(stream); }, - onStyleChanged: function(actor, event) { - let digitWidth = _getDigitWidth(this.actor) / Pango.SCALE; - this.label.set_width(digitWidth * 5); - }, - connectWithStream: function(stream){ if(!stream){ this.actor.hide(); @@ -186,8 +167,6 @@ } this.setValue(value); - this.label.set_text(percentage); - // send data to applet this.emit("values-changed", iconName, percentage); }, @@ -204,16 +183,6 @@ icon = "high"; return this.isMic? "microphone-sensitivity-" + icon : "audio-volume-" + icon; - }, - - _togglePercentageDisplay: function(showPercentage) { - if (!showPercentage) - this.removeActor(this.label); - else { - this.removeActor(this._slider); - this.addActor(this.label, {span: 0}); - this.addActor(this._slider, {span: -1, expand: true}); - } } } @@ -420,8 +389,6 @@ // Position slider this._positionSlider = new Slider.Slider(0, true); - this._currentTimeLabel = new St.Label({text: "0:00"}); - this._songLengthLabel = new St.Label({text: "0:00"}); this._seeking = false; this._positionSlider.connect('drag-begin', Lang.bind(this, function(item) { this._seeking = true; @@ -432,9 +399,7 @@ })); this._positionSlider.connect('value-changed', Lang.bind(this, function(item) { //update the label virtually if we are seeking, else set the value (scroll event) - if(this._seeking) - this._updateTimeLabel(item._value * this._songLength); - else + if(!this._seeking) this._setPosition("slider"); })); this.vertBox.add_actor(this._positionSlider.actor); @@ -537,7 +502,6 @@ let time = this._positionSlider._value * this._songLength; this._wantedSeekValue = Math.round(time * 1000000); this._mediaServerPlayer.SetPositionRemote(this._trackObj, time * 1000000); - this._updateTimeLabel(time); } else if (value == null && this._playerStatus != 'Stopped') { this._updatePositionSlider(false); @@ -728,19 +692,6 @@ else this._positionSlider.setValue(0); } - if(!this._seeking) - this._updateTimeLabel(); - }, - - _updateTimeLabel: function(time){ - if(time === undefined) - time = this._currentTime; - - this._currentTimeLabel.text = this._formatTime(time); - if(this._applet.positionLabelType === "length") - this._songLengthLabel.text = this._formatTime(this._songLength); - else - this._songLengthLabel.text = "-" + this._formatTime(this._songLength - time); }, _runTimerCallback: function() { @@ -788,25 +739,6 @@ this._updateTimer(); }, - _formatTime: function(s) { - let ms = s * 1000; - let msSecs = (1000); - let msMins = (msSecs * 60); - let msHours = (msMins * 60); - let numHours = Math.floor(ms/msHours); - let numMins = Math.floor((ms - (numHours * msHours)) / msMins); - let numSecs = Math.floor((ms - (numHours * msHours) - (numMins * msMins))/ msSecs); - if (numSecs < 10) - numSecs = "0" + numSecs.toString(); - if (numMins < 10 && numHours > 0) - numMins = "0" + numMins.toString(); - if (numHours > 0) - numHours = numHours.toString() + ":"; - else - numHours = ""; - return numHours + numMins.toString() + ":" + numSecs.toString(); - }, - _onDownloadedCover: function() { let cover_path = this._trackCoverFileTmp.get_path(); this._showCover(cover_path); @@ -922,11 +854,6 @@ for(let i in this._players) this._players[i].onSettingsChanged(); }); - this.settings.bind("positionLabelType", "positionLabelType", function(){ - for(let i in this._players) - this._players[i].onSettingsChanged(); - }); - this.settings.bind("showSliderPercentage", "showSliderPercentage", this._showPercentageChanged); this.settings.bind("_knownPlayers", "_knownPlayers"); if (this.hideSystray) this.registerSystrayIcons(); @@ -1350,7 +1277,6 @@ this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem); this._outputVolumeSection = new VolumeSlider(this, null, _("Volume"), null); this._outputVolumeSection.connect("values-changed", Lang.bind(this, this._outputValuesChanged)); - this._showPercentageChanged(); this.menu.addMenuItem(this._outputVolumeSection); this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem); @@ -1438,10 +1364,6 @@ this.mute_in_switch.setIconSymbolicName(iconName); }, - _showPercentageChanged: function() { - this._outputVolumeSection._togglePercentageDisplay(this.showSliderPercentage); - }, - _onControlStateChanged: function() { if (this._control.get_state() == Cvc.MixerControlState.READY) { this._readOutput(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Cinnamon-3.2.1/files/usr/share/cinnamon/applets/sound(a)cinnamon.org/settings-schema.json new/Cinnamon-3.2.2/files/usr/share/cinnamon/applets/sound(a)cinnamon.org/settings-schema.json --- old/Cinnamon-3.2.1/files/usr/share/cinnamon/applets/sound(a)cinnamon.org/settings-schema.json 2016-11-08 15:27:01.000000000 +0100 +++ new/Cinnamon-3.2.2/files/usr/share/cinnamon/applets/sound(a)cinnamon.org/settings-schema.json 2016-11-23 14:03:02.000000000 +0100 @@ -15,22 +15,6 @@ "dependency": "playerControl", "indent": true }, - "positionLabelType": { - "type": "combobox", - "default": "length", - "description": "Position label", - "options": { - "Song length": "length", - "Countdown": "countdown" - }, - "dependency": "playerControl", - "indent": true - }, - "showSliderPercentage": { - "type": "switch", - "default": false, - "description": "Show percentage value of the slider" - }, "_knownPlayers": { "type": "generic", "default": ["banshee", "vlc"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Cinnamon-3.2.1/files/usr/share/cinnamon/applets/workspace-switcher(a)cinnamon.org/applet.js new/Cinnamon-3.2.2/files/usr/share/cinnamon/applets/workspace-switcher(a)cinnamon.org/applet.js --- old/Cinnamon-3.2.1/files/usr/share/cinnamon/applets/workspace-switcher(a)cinnamon.org/applet.js 2016-11-08 15:27:01.000000000 +0100 +++ new/Cinnamon-3.2.2/files/usr/share/cinnamon/applets/workspace-switcher(a)cinnamon.org/applet.js 2016-11-23 14:03:02.000000000 +0100 @@ -185,13 +185,11 @@ this.actor.add_style_pseudo_class('outlined'); } - if (applet._scaleMode) { - if (applet.orientation == St.Side.TOP || applet.orientation == St.Side.BOTTOM) { - this.actor.set_height(applet._panelHeight); - } else { - this.actor.set_height(0.6 * applet._panelHeight); // factors are completely empirical - this.actor.set_width(0.9 * applet._panelHeight); - } + if (applet.orientation == St.Side.TOP || applet.orientation == St.Side.BOTTOM) { + this.actor.set_height(applet._panelHeight); + } else { + this.actor.set_height(0.6 * applet._panelHeight); // factors are completely empirical + this.actor.set_width(0.9 * applet._panelHeight); } if (applet.orientation == St.Side.LEFT || applet.orientation == St.Side.RIGHT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Cinnamon-3.2.1/files/usr/share/cinnamon/cinnamon-json-makepot/cinnamon-json-makepot.py new/Cinnamon-3.2.2/files/usr/share/cinnamon/cinnamon-json-makepot/cinnamon-json-makepot.py --- old/Cinnamon-3.2.1/files/usr/share/cinnamon/cinnamon-json-makepot/cinnamon-json-makepot.py 2016-11-08 15:27:01.000000000 +0100 +++ new/Cinnamon-3.2.2/files/usr/share/cinnamon/cinnamon-json-makepot/cinnamon-json-makepot.py 2016-11-23 14:03:02.000000000 +0100 @@ -217,7 +217,7 @@ def extract_strings(self, data, parent=""): for key in data.keys(): - if key in ("description", "tooltip", "units"): + if key in ("description", "tooltip", "units", "title"): comment = "%s->settings-schema.json->%s->%s" % (self.current_parent_dir, parent, key) self.save_entry(data[key], comment) elif key in "options": diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Cinnamon-3.2.1/files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py new/Cinnamon-3.2.2/files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py --- old/Cinnamon-3.2.1/files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py 2016-11-08 15:27:01.000000000 +0100 +++ new/Cinnamon-3.2.2/files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py 2016-11-23 14:03:02.000000000 +0100 @@ -962,11 +962,11 @@ self.preview.set_from_icon_name(val, Gtk.IconSize.BUTTON) def on_button_pressed(self, widget): - dialog = Gtk.FileChooserDialog(_("Choose an Icon"), - None, - Gtk.FileChooserAction.OPEN, - (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, - Gtk.STOCK_OPEN, Gtk.ResponseType.OK)) + dialog = Gtk.FileChooserDialog(title=_("Choose an Icon"), + action=Gtk.FileChooserAction.OPEN, + transient_for=self.get_toplevel(), + buttons=(_("_Cancel"), Gtk.ResponseType.CANCEL, + _("_Open"), Gtk.ResponseType.OK)) filter_text = Gtk.FileFilter() filter_text.set_name(_("Image files")) @@ -982,22 +982,23 @@ if response == Gtk.ResponseType.OK: filename = dialog.get_filename() self.bind_object.set_text(filename) - self.set_val(filename) + self.set_value(filename) dialog.destroy() def update_icon_preview_cb(self, dialog, preview): filename = dialog.get_preview_filename() dialog.set_preview_widget_active(False) - if os.path.isfile(filename): - pixbuf = GdkPixbuf.Pixbuf.new_from_file(filename) - if pixbuf is not None: - if pixbuf.get_width() > 128: - pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(filename, 128, -1) - elif pixbuf.get_height() > 128: - pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(filename, -1, 128) - preview.set_from_pixbuf(pixbuf) - dialog.set_preview_widget_active(True) + if filename is not None: + if os.path.isfile(filename): + pixbuf = GdkPixbuf.Pixbuf.new_from_file(filename) + if pixbuf is not None: + if pixbuf.get_width() > 128: + pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(filename, 128, -1) + elif pixbuf.get_height() > 128: + pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(filename, -1, 128) + preview.set_from_pixbuf(pixbuf) + dialog.set_preview_widget_active(True) class TweenChooser(SettingsWidget): bind_prop = "tween" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Cinnamon-3.2.1/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py new/Cinnamon-3.2.2/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py --- old/Cinnamon-3.2.1/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py 2016-11-08 15:27:01.000000000 +0100 +++ new/Cinnamon-3.2.2/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py 2016-11-23 14:03:02.000000000 +0100 @@ -67,7 +67,7 @@ CONTROL_CENTER_MODULES = [ # Label Module ID Icon Category Keywords for filter - [_("Networking"), "network", "cs-network", "hardware", _("network, wireless, wifi, ethernet, broadband, internet")], + [_("Network"), "network", "cs-network", "hardware", _("network, wireless, wifi, ethernet, broadband, internet")], [_("Display"), "display", "cs-display", "hardware", _("display, screen, monitor, layout, resolution, dual, lcd")], [_("Color"), "color", "cs-color", "hardware", _("color, profile, display, printer, output")], [_("Graphics Tablet"), "wacom", "cs-tablet", "hardware", _("wacom, digitize, tablet, graphics, calibrate, stylus")] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Cinnamon-3.2.1/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py new/Cinnamon-3.2.2/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py --- old/Cinnamon-3.2.1/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py 2016-11-08 15:27:01.000000000 +0100 +++ new/Cinnamon-3.2.2/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py 2016-11-23 14:03:02.000000000 +0100 @@ -601,10 +601,11 @@ # Convert RGBA PIL Image to Pixbuf def _image_to_pixbuf(self, img): + [w, h] = img.size return GdkPixbuf.Pixbuf.new_from_bytes(GLib.Bytes.new(img.tobytes()), GdkPixbuf.Colorspace.RGB, - True, 8, img.width, img.height, - img.width * 4) + True, 8, w, h, + w * 4) PIX_CACHE = PixCache() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Cinnamon-3.2.1/files/usr/share/cinnamon/cinnamon-settings/modules/cs_effects.py new/Cinnamon-3.2.2/files/usr/share/cinnamon/cinnamon-settings/modules/cs_effects.py --- old/Cinnamon-3.2.1/files/usr/share/cinnamon/cinnamon-settings/modules/cs_effects.py 2016-11-08 15:27:01.000000000 +0100 +++ new/Cinnamon-3.2.2/files/usr/share/cinnamon/cinnamon-settings/modules/cs_effects.py 2016-11-23 14:03:02.000000000 +0100 @@ -66,7 +66,7 @@ self.bind_prop = "tween" self.bind_dir = Gio.SettingsBindFlags.DEFAULT self.bind_object = self - + if schema not in settings_objects.keys(): settings_objects[schema] = Gio.Settings.new(schema) self.settings = settings_objects[schema] @@ -80,7 +80,7 @@ self.bind_prop = "effect" self.bind_dir = Gio.SettingsBindFlags.DEFAULT self.bind_object = self - + if schema not in settings_objects.keys(): settings_objects[schema] = Gio.Settings.new(schema) self.settings = settings_objects[schema] @@ -259,4 +259,7 @@ if not active and schema.get_boolean("desktop-effects-on-dialogs"): schema.set_boolean("desktop-effects-on-dialogs", False) + if not active and schema.get_boolean("desktop-effects-on-menus"): + schema.set_boolean("desktop-effects-on-menus", False) + self.update_effects(self.custom_switch, None) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Cinnamon-3.2.1/files/usr/share/cinnamon/cinnamon-settings/xlet-settings.py new/Cinnamon-3.2.2/files/usr/share/cinnamon/cinnamon-settings/xlet-settings.py --- old/Cinnamon-3.2.1/files/usr/share/cinnamon/cinnamon-settings/xlet-settings.py 2016-11-08 15:27:01.000000000 +0100 +++ new/Cinnamon-3.2.2/files/usr/share/cinnamon/cinnamon-settings/xlet-settings.py 2016-11-23 14:03:02.000000000 +0100 @@ -52,10 +52,10 @@ #check for a translation for this xlet if uuid not in translations: try: - translations[uuid] = gettext.translation(uuid, home + "/.local/share/locale").ugettext + translations[uuid] = gettext.translation(uuid, home + "/.local/share/locale").gettext except IOError: try: - translations[uuid] = gettext.translation(uuid, "/usr/share/locale").ugettext + translations[uuid] = gettext.translation(uuid, "/usr/share/locale").gettext except IOError: translations[uuid] = None @@ -65,6 +65,12 @@ if translations[uuid]: result = translations[uuid](string) + + try: + result = result.decode("utf-8") + except: + result = result + if result != string: return result return _(string) @@ -74,7 +80,7 @@ self.type = xlet_type self.uuid = uuid self.selected_instance = None - + self.load_xlet_data() self.build_window() self.load_instances() @@ -180,7 +186,7 @@ icon_path = os.path.join(self.xlet_dir, "icon.png") if os.path.exists(icon_path): self.window.set_icon_from_file(icon_path) - self.window.set_title(self.xlet_meta["name"]) + self.window.set_title(translate(self.uuid, self.xlet_meta["name"])) self.window.connect("destroy", self.quit) self.prev_button.connect("clicked", self.previous_instance) @@ -207,17 +213,37 @@ settings_map = settings.get_settings() first_key = next(iter(settings_map.values())) - # if a layout is not expicitly defined, generate the settings - # widgets based on the order they occur - if first_key["type"] == "layout": - self.build_with_layout(settings_map, info, instance_box, first_key) - else: - self.build_from_order(settings_map, info, instance_box, first_key) - - if self.selected_instance is None: - self.selected_instance = info - if "stack" in info: - self.stack_switcher.set_stack(info["stack"]) + + try: + for setting in settings_map.keys(): + if setting == "__md5__": + continue + for key in settings_map[setting].keys(): + if key in ("description", "tooltip", "units"): + try: + settings_map[setting][key] = translate(self.uuid, settings_map[setting][key]) + except: + pass + elif key in "options": + new_opt_data = collections.OrderedDict() + opt_data = settings_map[setting][key] + for option in opt_data.keys(): + if opt_data[option] == "custom": + continue + new_opt_data[translate(self.uuid, option)] = opt_data[option] + settings_map[setting][key] = new_opt_data + finally: + # if a layout is not expicitly defined, generate the settings + # widgets based on the order they occur + if first_key["type"] == "layout": + self.build_with_layout(settings_map, info, instance_box, first_key) + else: + self.build_from_order(settings_map, info, instance_box, first_key) + + if self.selected_instance is None: + self.selected_instance = info + if "stack" in info: + self.stack_switcher.set_stack(info["stack"]) def build_with_layout(self, settings_map, info, box, first_key): layout = first_key @@ -230,10 +256,10 @@ for page_key in layout["pages"]: page_def = layout[page_key] page = SettingsPage() - page_stack.add_titled(page, page_key, page_def["title"]) + page_stack.add_titled(page, page_key, translate(self.uuid, page_def["title"])) for section_key in page_def["sections"]: section_def = layout[section_key] - section = page.add_section(section_def["title"]) + section = page.add_section(translate(self.uuid, section_def["title"])) for key in section_def["keys"]: item = settings_map[key] settings_type = item["type"] @@ -241,7 +267,7 @@ widget = XLETSettingsButton(item, self.uuid, info["id"]) section.add_row(widget) elif settings_type == "label": - widget = Text(item["description"]) + widget = Text(translate(self.uuid, item["description"])) section.add_row(widget) elif settings_type in XLET_SETTINGS_WIDGETS: widget = globals()[XLET_SETTINGS_WIDGETS[settings_type]](key, info["settings"], item) @@ -261,12 +287,12 @@ if "type" in item.keys(): settings_type = item["type"] if settings_type in ("header", "section"): - section = page.add_section(item["description"]) + section = page.add_section(translate(self.uuid, item["description"])) elif settings_type == "button": widget = XLETSettingsButton(item, self.uuid, info["id"]) section.add_row(widget) elif settings_type == "label": - widget = Text(item["description"]) + widget = Text(translate(self.uuid, item["description"])) section.add_row(widget) elif settings_type in XLET_SETTINGS_WIDGETS: widget = globals()[XLET_SETTINGS_WIDGETS[settings_type]](key, info["settings"], item) @@ -274,7 +300,7 @@ def notify_dbus(self, handler, key, value): proxy.updateSetting('(ssss)', self.uuid, handler.instance_id, key, json.dumps(value)) - + def set_instance(self, info): self.instance_stack.set_visible_child_name(info["id"]) if "stack" in info: @@ -351,7 +377,7 @@ def quit(self, *args): if proxy: proxy.highlightXlet('(ssb)', self.uuid, self.selected_instance["id"], False) - + self.window.destroy() Gtk.main_quit() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Cinnamon-3.2.1/js/misc/fileUtils.js new/Cinnamon-3.2.2/js/misc/fileUtils.js --- old/Cinnamon-3.2.1/js/misc/fileUtils.js 2016-11-08 15:27:01.000000000 +0100 +++ new/Cinnamon-3.2.2/js/misc/fileUtils.js 2016-11-23 14:03:02.000000000 +0100 @@ -28,6 +28,14 @@ return file['delete'](null); } +function changeModeGFile(file, octal) { + if(file.query_exists(null)) { + let info = file.query_info("unix::mode", Gio.FileQueryInfoFlags.NONE, null); + info.set_attribute_uint32("unix::mode", parseInt(octal, 8)); + file.set_attributes_from_info(info, Gio.FileQueryInfoFlags.NONE, null); + } +} + function recursivelyDeleteDir(dir) { let children = dir.enumerate_children('standard::name,standard::type', Gio.FileQueryInfoFlags.NONE, null); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Cinnamon-3.2.1/js/ui/applet.js new/Cinnamon-3.2.2/js/ui/applet.js --- old/Cinnamon-3.2.1/js/ui/applet.js 2016-11-08 15:27:01.000000000 +0100 +++ new/Cinnamon-3.2.2/js/ui/applet.js 2016-11-23 14:03:02.000000000 +0100 @@ -27,7 +27,7 @@ VERTICAL: 'vertical', HORIZONTAL: 'horizontal', BOTH: 'both' -} +}; /** * #MenuItem @@ -42,9 +42,9 @@ /** * #AppletContextMenu * @short_description: Applet right-click menu - * + * * A context menu (right-click menu) to be used by an applet - * + * * Inherits: PopupMenu.PopupMenu */ function AppletContextMenu(launcher, orientation) { @@ -58,25 +58,30 @@ * _init: * @launcher (Applet.Applet): The applet that contains the context menu * @orientation (St.Side): The orientation of the applet - * + * * Constructor function */ - _init: function(launcher, orientation) { + _init: function(launcher, orientation) { PopupMenu.PopupMenu.prototype._init.call(this, launcher.actor, orientation); Main.uiGroup.add_actor(this.actor); - this.actor.hide(); + this.actor.hide(); + this.connect("open-state-changed", Lang.bind(this, this._onOpenStateChanged, launcher.actor)); launcher.connect("orientation-changed", Lang.bind(this, function(a, orientation) { this.setArrowSide(orientation); - })) - } + })); + }, + + _onOpenStateChanged: function(menu, open, sourceActor) { + sourceActor.change_style_pseudo_class("checked", open); + } }; /** * #AppletPopupMenu: * @short_description: Applet left-click menu - * + * * A popupmenu menu (left-click menu) to be used by an applet - * + * * Inherits: PopupMenu.PopupMenu */ function AppletPopupMenu(launcher, orientation) { @@ -90,7 +95,7 @@ * _init: * @launcher (Applet.Applet): The applet that contains the context menu * @orientation (St.Side): The orientation of the applet - * + * * Constructor function */ _init: function(launcher, orientation) { @@ -98,16 +103,23 @@ Main.uiGroup.add_actor(this.actor); this.actor.hide(); this.launcher = launcher; - if (launcher instanceof Applet) + if (launcher instanceof Applet) { + this.connect("open-state-changed", Lang.bind(this, this._onOpenStateChanged, launcher)); launcher.connect("orientation-changed", Lang.bind(this, this._onOrientationChanged)); - else if (launcher._applet) + } else if (launcher._applet) { launcher._applet.connect("orientation-changed", Lang.bind(this, this._onOrientationChanged)); + } }, _onOrientationChanged: function(a, orientation) { this.setArrowSide(orientation); + }, + + _onOpenStateChanged: function(menu, open, sourceActor) { + if (!sourceActor._applet_context_menu.isOpen) + sourceActor.actor.change_style_pseudo_class("checked", open); } -} +}; /** * #Applet @@ -134,7 +146,7 @@ * @_allowedLayout (Applet.AllowedLayout): The allowed layout of the applet. This * determines the type of panel an applet is allowed in. By default this is set * to Applet.AllowedLayout.HORIZONTAL - * + * * Base applet class that other applets can inherit */ function Applet(orientation, panelHeight, instance_id) { @@ -157,18 +169,18 @@ this._allowedLayout = AllowedLayout.HORIZONTAL; this.setOrientationInternal(orientation); - - this._applet_tooltip = new Tooltips.PanelItemTooltip(this, "", orientation); - this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPressEvent)); + + this._applet_tooltip = new Tooltips.PanelItemTooltip(this, "", orientation); + this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPressEvent)); this._menuManager = new PopupMenu.PopupMenuManager(this); this._applet_context_menu = new AppletContextMenu(this, orientation); - this._menuManager.addMenu(this._applet_context_menu); + this._menuManager.addMenu(this._applet_context_menu); - this.actor._applet = this; // Backlink to get the applet from its actor + this.actor._applet = this; // Backlink to get the applet from its actor // (handy when we want to know stuff about a particular applet within the panel) this.actor._delegate = this; - this._order = 0; // Defined in gsettings, this is the order of the applet within a panel location. + this._order = 0; // Defined in gsettings, this is the order of the applet within a panel location. // This value is set by Cinnamon when loading/listening_to gsettings. this._newOrder = null; // Used when moving an applet this._panelLocation = null; // Backlink to the panel location our applet is in, set by Cinnamon. @@ -181,11 +193,11 @@ this._uuid = null; // Defined in gsettings, set by Cinnamon. this._hook = null; // Defined in metadata.json, set by appletManager this._meta = null; // set by appletManager - this._dragging = false; + this._dragging = false; this._draggable = DND.makeDraggable(this.actor); this._draggable.connect('drag-begin', Lang.bind(this, this._onDragBegin)); this._draggable.connect('drag-cancelled', Lang.bind(this, this._onDragCancelled)); - this._draggable.connect('drag-end', Lang.bind(this, this._onDragEnd)); + this._draggable.connect('drag-end', Lang.bind(this, this._onDragEnd)); try { this._scaleMode = AppletManager.enabledAppletDefinitions.idMap[instance_id].panel.scaleMode; @@ -205,7 +217,7 @@ this._setAppletReactivity(); this._panelEditModeChangedId = global.settings.connect('changed::panel-edit-mode', Lang.bind(this, function() { - this._setAppletReactivity(); + this._setAppletReactivity(); })); }, @@ -220,17 +232,17 @@ _onDragBegin: function() { this._dragging = true; this._applet_tooltip.hide(); - this._applet_tooltip.preventShow = true; + this._applet_tooltip.preventShow = true; }, _onDragEnd: function() { this._dragging = false; - this._applet_tooltip.preventShow = false; + this._applet_tooltip.preventShow = false; }, _onDragCancelled: function() { this._dragging = false; - this._applet_tooltip.preventShow = false; + this._applet_tooltip.preventShow = false; }, getDragActor: function() { @@ -258,9 +270,9 @@ this.on_applet_clicked(event); } } - if (event.get_button() == 3) { + if (event.get_button() == 3) { if (this._applet_context_menu._getMenuItems().length > 0) { - this._applet_context_menu.toggle(); + this._applet_context_menu.toggle(); } } } @@ -270,7 +282,7 @@ /** * set_applet_tooltip: * @text (string): the tooltip text to be set - * + * * Sets the tooltip of the applet */ set_applet_tooltip: function (text) { @@ -283,7 +295,7 @@ /** * set_applet_enabled: * @enabled (boolean): whether this applet is enabled or not - * + * * Sets whether the applet is enabled or not. A disabled applet sets its * padding to 0px and doesn't react to clicks */ @@ -297,13 +309,13 @@ /** * on_applet_clicked: * @event (Clutter.Event): the event object - * + * * This function is called when the applet is clicked. - * + * * This is meant to be overridden in individual applets. */ on_applet_clicked: function(event) { - // Implemented by Applets + // Implemented by Applets }, @@ -313,7 +325,7 @@ * This function is called when an applet *of the same uuid* is added or * removed from the panels. It is intended to assist in delegation of * responsibilities between duplicate applet instances. - * + * * This is meant to be overridden in individual applets */ on_applet_instances_changed: function() { @@ -338,9 +350,9 @@ /** * on_applet_added_to_panel: - * + * * This function is called by appletManager when the applet is added to the panel. - * + * * This is meant to be overridden in individual applets. */ on_applet_added_to_panel: function(userEnabled) { @@ -348,9 +360,9 @@ /** * on_applet_removed_from_panel: - * + * * This function is called by appletManager when the applet is removed from the panel. - * + * * This is meant to be overridden in individual applets. */ on_applet_removed_from_panel: function() { @@ -386,9 +398,9 @@ /** * setOrientation: * @orientation (St.Side): the orientation - * + * * Sets the orientation of the applet. - * + * * This function should only be called by appletManager */ setOrientation: function (orientation) { @@ -424,19 +436,19 @@ /** * on_orientation_changed: * @orientation (St.Side): new orientation of the applet - * + * * This function is called when the applet is changes orientation. - * + * * This is meant to be overridden in individual applets. - */ + */ on_orientation_changed: function(orientation) { - // Implemented by Applets + // Implemented by Applets }, /** * setPanelHeight: * @panelHeight (int): panelHeight - * + * * Sets the panel height property of the applet. */ setPanelHeight: function (panel_height) { @@ -446,7 +458,7 @@ this._scaleMode = AppletManager.enabledAppletDefinitions.idMap[this.instance_id].panel.scaleMode; this.on_panel_height_changed_internal(); }, - + /** * on_panel_height_changed_internal: * @@ -458,18 +470,18 @@ /** * on_panel_height_changed: - * + * * This function is called when the panel containing the applet changes height - * + * * This is meant to be overridden in individual applets. - */ + */ on_panel_height_changed: function() { // Implemented byApplets }, - + finalizeContextMenu: function () { - // Add default context menus if we're in panel edit mode, ensure their removal if we're not + // Add default context menus if we're in panel edit mode, ensure their removal if we're not let items = this._applet_context_menu._getMenuItems(); if (this.context_menu_item_remove == null) { @@ -492,12 +504,16 @@ this.context_menu_separator = new PopupMenu.PopupSeparatorMenuItem(); } + if (this._applet_context_menu._getMenuItems().length > 0) { + this._applet_context_menu.addMenuItem(this.context_menu_separator); + } + if (items.indexOf(this.context_menu_item_about) == -1) { this._applet_context_menu.addMenuItem(this.context_menu_item_about); } if (!this._meta["hide-configuration"] && GLib.file_test(this._meta["path"] + "/settings-schema.json", GLib.FileTest.EXISTS)) { - if (this.context_menu_item_configure == null) { + if (this.context_menu_item_configure == null) { this.context_menu_item_configure = new PopupMenu.PopupIconMenuItem(_("Configure..."), "system-run", St.IconType.SYMBOLIC); @@ -538,9 +554,9 @@ * @short_description: Applet with icon * * @_applet_icon (St.Icon): Actor of the icon - * + * * Applet that contains an icon - * + * * Inherits: Applet.Applet */ function IconApplet(orientation, panel_height, instance_id) { @@ -569,13 +585,13 @@ /** * set_applet_icon_name: * @icon_name (string): Name of the icon - * + * * Sets the icon of the applet to @icon_name. - * + * * The icon will be full color */ set_applet_icon_name: function (icon_name) { - this._ensureIcon() + this._ensureIcon(); this._applet_icon.set_icon_name(icon_name); this._applet_icon.set_icon_type(St.IconType.FULLCOLOR); @@ -585,13 +601,13 @@ /** * set_applet_icon_symbolic_name: * @icon_name (string): Name of the icon - * + * * Sets the icon of the applet to @icon_name. - * + * * The icon will be symbolic */ set_applet_icon_symbolic_name: function (icon_name) { - this._ensureIcon() + this._ensureIcon(); this._applet_icon.set_icon_name(icon_name); this._applet_icon.set_icon_type(St.IconType.SYMBOLIC); @@ -601,13 +617,13 @@ /** * set_applet_icon_path: * @icon_path (string): path of the icon - * + * * Sets the icon of the applet to the image file at @icon_path - * + * * The icon will be full color */ set_applet_icon_path: function (icon_path) { - this._ensureIcon() + this._ensureIcon(); try { let file = Gio.file_new_for_path(icon_path); @@ -622,13 +638,13 @@ /** * set_applet_icon_symbolic_path: * @icon_path (string): path of the icon - * + * * Sets the icon of the applet to the image file at @icon_path - * + * * The icon will be symbolic */ set_applet_icon_symbolic_path: function(icon_path) { - this._ensureIcon() + this._ensureIcon(); try { let file = Gio.file_new_for_path(icon_path); @@ -687,7 +703,7 @@ * @_applet_label (St.Label): Label of the applet * * Applet that displays a text - * + * * Inherits: Applet.Applet */ function TextApplet(orientation, panel_height, instance_id) { @@ -708,15 +724,15 @@ */ _init: function(orientation, panel_height, instance_id) { Applet.prototype._init.call(this, orientation, panel_height, instance_id); - this._applet_label = new St.Label({ reactive: true, - track_hover: true, + this._applet_label = new St.Label({ reactive: true, + track_hover: true, style_class: 'applet-label'}); this._applet_label.clutter_text.ellipsize = Pango.EllipsizeMode.NONE; this._layoutBin = new St.Bin(); this._layoutBin.set_child(this._applet_label); - this.actor.add(this._layoutBin, { y_align: St.Align.MIDDLE, + this.actor.add(this._layoutBin, { y_align: St.Align.MIDDLE, y_fill: false }); this.actor.set_label_actor(this._applet_label); }, @@ -724,14 +740,14 @@ /** * set_applet_label: * @text (string): text to be displayed at the label - * + * * Sets the text of the actor to @text */ set_applet_label: function (text) { this._applet_label.set_text(text); }, - - on_applet_added_to_panel: function() { + + on_applet_added_to_panel: function() { } }; @@ -741,7 +757,7 @@ * @_applet_label (St.Label): Label of the applet * * Applet that displays an icon and a text. The icon is on the left of the text - * + * * Inherits: Applet.IconApplet * Note that suitability for display in a vertical panel is handled by having applets declare * they work OK, handled elsewhere @@ -761,15 +777,15 @@ */ _init: function(orientation, panel_height, instance_id) { IconApplet.prototype._init.call(this, orientation, panel_height, instance_id); - this._applet_label = new St.Label({ reactive: true, - track_hover: true, + this._applet_label = new St.Label({ reactive: true, + track_hover: true, style_class: 'applet-label'}); this._applet_label.clutter_text.ellipsize = Pango.EllipsizeMode.NONE; this._layoutBin = new St.Bin(); this._layoutBin.set_child(this._applet_label); - this.actor.add(this._layoutBin, { y_align: St.Align.MIDDLE, + this.actor.add(this._layoutBin, { y_align: St.Align.MIDDLE, y_fill: false }); this.actor.set_label_actor(this._applet_label); }, @@ -781,7 +797,7 @@ * empty string. The margin is always set to zero in a vertical panel */ update_label_margin: function () { - let text = this._applet_label.get_text() + let text = this._applet_label.get_text(); if ((text && text != "") && this._applet_icon_box.child && (this._orientation == St.Side.TOP || this._orientation == St.Side.BOTTOM)) { @@ -794,7 +810,7 @@ /** * set_applet_label: * @text (string): text to be displayed at the label - * + * * Sets the text of the actor to @text */ set_applet_label: function (text) { @@ -805,7 +821,7 @@ /** * set_applet_enabled: * @enabled (boolean): whether this applet is enabled or not - * + * * Sets whether the applet is enabled or not. A disabled applet sets its * padding to 0px and doesn't react to clicks */ @@ -841,14 +857,14 @@ /** * hide_applet_icon: - * + * * Hides the icon of the applet */ hide_applet_icon: function () { this._applet_icon_box.child = null; }, - - on_applet_added_to_panel: function() { - + + on_applet_added_to_panel: function() { + } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Cinnamon-3.2.1/js/ui/indicatorManager.js new/Cinnamon-3.2.2/js/ui/indicatorManager.js --- old/Cinnamon-3.2.1/js/ui/indicatorManager.js 2016-11-08 15:27:01.000000000 +0100 +++ new/Cinnamon-3.2.2/js/ui/indicatorManager.js 2016-11-23 14:03:02.000000000 +0100 @@ -1200,15 +1200,18 @@ return [path, realSize]; }, - _createIconByName: function(path, realSize) { + _createIconByName: function(path, iconSize) { try { let pixbuf = GdkPixbuf.Pixbuf.new_from_file(path); let icon = new St.Icon({ style_class: 'applet-icon',//FIXME: Use instead the status icon style class. gicon: pixbuf, }); - if (realSize) - icon.set_icon_size(realSize); + if (iconSize) + icon.set_icon_size(iconSize); + //Connect this always, because the user can enable/disable the panel scale mode + //when he want, otherwise we need to control the scale mode internally. + icon.connect('notify::mapped', Lang.bind(this, this._onIconMapped)); return icon; } catch (e) { // the image data was probably bogus. We don't really know why, but it _does_ happen. @@ -1252,6 +1255,9 @@ }); if (iconSize) icon.set_icon_size(iconSize); + //Connect this always, because the user can enable/disable the panel scale mode + //when he want, otherwise we need to control the scale mode internally. + icon.connect('notify::mapped', Lang.bind(this, this._onIconMapped)); return icon; } catch (e) { // the image data was probably bogus. We don't really know why, but it _does_ happen. @@ -1261,6 +1267,15 @@ return null; }, + _onIconMapped: function(actor, event) { + if (!this._iconSize) { + let themeNode = actor.get_theme_node(); + let [found, size] = themeNode.lookup_length('icon-size', false); + if (!found) + actor.set_icon_size(16); + } + }, + // updates the base icon _updateIcon: function() { // remove old icon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Cinnamon-3.2.1/js/ui/panel.js new/Cinnamon-3.2.2/js/ui/panel.js --- old/Cinnamon-3.2.1/js/ui/panel.js 2016-11-08 15:27:01.000000000 +0100 +++ new/Cinnamon-3.2.2/js/ui/panel.js 2016-11-23 14:03:02.000000000 +0100 @@ -1672,7 +1672,7 @@ let menuItem = new SettingsLauncher(_("Themes"), "themes", "applications-graphics"); this.addMenuItem(menuItem); - let menuSetting = new SettingsLauncher(_("All settings"), "", "preferences-system"); + let menuSetting = new SettingsLauncher(_("System Settings"), "", "preferences-system"); this.addMenuItem(menuSetting); populateSettingsMenu(this, panelId); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Cinnamon-3.2.1/js/ui/popupMenu.js new/Cinnamon-3.2.2/js/ui/popupMenu.js --- old/Cinnamon-3.2.1/js/ui/popupMenu.js 2016-11-08 15:27:01.000000000 +0100 +++ new/Cinnamon-3.2.2/js/ui/popupMenu.js 2016-11-23 14:03:02.000000000 +0100 @@ -2175,7 +2175,22 @@ this._orientation = orientation; }, - /* + /** + * setCustomStyleClass: + * @className (string): the custom class name to add + * + * Adds a custom class name to the menu which allows it to be styled separately from other menus. + */ + setCustomStyleClass: function(className) { + this.customStyleClass = className; + if (this.actor.get_style_class_name()) { + this.actor.set_style_class_name(this.actor.get_style_class_name() + "" + className) + } else { + this.actor.set_style_class_name(className); + } + }, + + /** * setSourceAlignment: * @alignment (real): the position of the arrow relative to the source * actor. @@ -2481,6 +2496,7 @@ } let xPos, yPos; + let styleClasses = ["menu"]; switch (this._orientation) { case St.Side.TOP: case St.Side.BOTTOM: @@ -2496,12 +2512,12 @@ if (this._orientation == St.Side.BOTTOM) { this.sideFlipped = true; yPos = sourceBox.y1 - natHeight; - this.actor.set_style_class_name('menu bottom'); + styleClasses.push("bottom"); } else { this.sideFlipped = false; yPos = sourceBox.y2; - this.actor.set_style_class_name('menu top'); + styleClasses.push("top"); } break; case St.Side.LEFT: @@ -2518,15 +2534,17 @@ if (this._orientation == St.Side.RIGHT || x2 - sourceBox.x2 < natWidth) { this.sideFlipped = true; xPos = sourceBox.x1 - natWidth; - this.actor.set_style_class_name('menu right'); + styleClasses.push("right"); } else { this.sideFlipped = false; xPos = sourceBox.x2; - this.actor.set_style_class_name('menu left'); + styleClasses.push("left"); } break; } + if (this.customStyleClass) styleClasses.push(this.customStyleClass); + this.actor.set_style_class_name(styleClasses.join(" ")); return [Math.round(xPos), Math.round(yPos)]; }, ++++++ cinnamon-no-gksu-requirement.patch ++++++ --- /var/tmp/diff_new_pack.nKAE7D/_old 2016-11-28 15:06:52.000000000 +0100 +++ /var/tmp/diff_new_pack.nKAE7D/_new 2016-11-28 15:06:52.000000000 +0100 @@ -8,7 +8,7 @@ +os.system("xdg-su -c '/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py'") --- a/files/usr/share/cinnamon/applets/menu(a)cinnamon.org/applet.js +++ b/files/usr/share/cinnamon/applets/menu(a)cinnamon.org/applet.js -@@ -157,10 +157,6 @@ ApplicationContextMenuItem.prototype = { +@@ -156,10 +156,6 @@ ApplicationContextMenuItem.prototype = { AppFavorites.getAppFavorites().removeFavorite(this._appButton.app.get_id()); this._appButton.toggleMenu(); break;

1 0

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

28 Nov '16

Hello community, here is the log from the commit of package perl-Wx for openSUSE:Factory checked in at 2016-11-28 15:06:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Wx (Old) and /work/SRC/openSUSE:Factory/.perl-Wx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Wx" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Wx/perl-Wx.changes 2015-12-29 12:59:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Wx.new/perl-Wx.changes 2016-11-28 15:06:37.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Nov 13 15:47:18 UTC 2016 - stefan.bruens(a)rwth-aachen.de + +- updated wxWidgets requirements from 2.8 to 3.0 for + distribution versions providing wxWidgets-3_0-nostl. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Wx.spec ++++++ --- /var/tmp/diff_new_pack.DdcfNC/_old 2016-11-28 15:06:38.000000000 +0100 +++ /var/tmp/diff_new_pack.DdcfNC/_new 2016-11-28 15:06:38.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Wx # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,7 +41,11 @@ %{perl_requires} # MANUAL BEGIN BuildRequires: gcc-c++ +%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 +BuildRequires: wxWidgets-3_0-nostl-devel +%else BuildRequires: wxWidgets-ansi-devel +%endif BuildRequires: xspp # MANUAL END ++++++ cpanspec.yml ++++++ --- /var/tmp/diff_new_pack.DdcfNC/_old 2016-11-28 15:06:38.000000000 +0100 +++ /var/tmp/diff_new_pack.DdcfNC/_new 2016-11-28 15:06:38.000000000 +0100 @@ -7,9 +7,13 @@ # foo.patch: -p1 # bar.patch: preamble: |- - BuildRequires: gcc-c++ - BuildRequires: wxWidgets-ansi-devel - BuildRequires: xspp + BuildRequires: gcc-c++ + %if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 + BuildRequires: wxWidgets-3_0-nostl-devel + %else + BuildRequires: wxWidgets-ansi-devel + %endif + BuildRequires: xspp #post_prep: |- # hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'` # sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL

1 0

commit python-itsdangerous for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '16

28 Nov '16

Hello community, here is the log from the commit of package python-itsdangerous for openSUSE:Factory checked in at 2016-11-28 15:06:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-itsdangerous (Old) and /work/SRC/openSUSE:Factory/.python-itsdangerous.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-itsdangerous" Changes: -------- --- /work/SRC/openSUSE:Factory/python-itsdangerous/python-itsdangerous.changes 2014-07-19 08:16:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-itsdangerous.new/python-itsdangerous.changes 2016-11-28 15:06:32.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 17 13:03:00 UTC 2016 - rjschwei(a)suse.com + +- Include in SLE 12 (FATE#320818, bsc#979331) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-itsdangerous.spec ++++++ --- /var/tmp/diff_new_pack.Gkgsig/_old 2016-11-28 15:06:33.000000000 +0100 +++ /var/tmp/diff_new_pack.Gkgsig/_new 2016-11-28 15:06:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-itsdangerous # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -13,15 +13,16 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Name: python-itsdangerous Version: 0.24 Release: 0 -License: BSD-3-Clause Summary: Various helpers to pass trusted data to untrusted environments and back -Url: http://github.com/mitsuhiko/itsdangerous +License: BSD-3-Clause Group: Development/Languages/Python +Url: http://github.com/mitsuhiko/itsdangerous Source: https://pypi.python.org/packages/source/i/itsdangerous/itsdangerous-%{versi… BuildRequires: python-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build

1 0

commit python-Werkzeug for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '16

28 Nov '16

Hello community, here is the log from the commit of package python-Werkzeug for openSUSE:Factory checked in at 2016-11-28 15:06:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Werkzeug (Old) and /work/SRC/openSUSE:Factory/.python-Werkzeug.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-Werkzeug" Changes: -------- --- /work/SRC/openSUSE:Factory/python-Werkzeug/python-Werkzeug.changes 2016-09-27 13:44:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-Werkzeug.new/python-Werkzeug.changes 2016-11-28 15:06:22.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 17 13:02:10 UTC 2016 - rjschwei(a)suse.com + +- Include in SLE 12 (FATE#320818, bsc#979331) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Werkzeug-doc.spec ++++++ --- /var/tmp/diff_new_pack.CxGkgb/_old 2016-11-28 15:06:23.000000000 +0100 +++ /var/tmp/diff_new_pack.CxGkgb/_new 2016-11-28 15:06:23.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package python3-Werkzeug-doc +# spec file for package python-Werkzeug-doc # # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. #

1 0

commit python-Flask for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '16

28 Nov '16

Hello community, here is the log from the commit of package python-Flask for openSUSE:Factory checked in at 2016-11-28 15:06:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Flask (Old) and /work/SRC/openSUSE:Factory/.python-Flask.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-Flask" Changes: -------- --- /work/SRC/openSUSE:Factory/python-Flask/python-Flask.changes 2016-09-27 13:44:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-Flask.new/python-Flask.changes 2016-11-28 15:06:17.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 17 13:00:22 UTC 2016 - rjschwei(a)suse.com + +- Include in SLE 12 (FATE#320818, bsc#979331) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Flask.spec ++++++ --- /var/tmp/diff_new_pack.64EPeJ/_old 2016-11-28 15:06:18.000000000 +0100 +++ /var/tmp/diff_new_pack.64EPeJ/_new 2016-11-28 15:06:18.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-Flask # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,8 +25,8 @@ Group: Development/Languages/Python Source: https://files.pythonhosted.org/packages/source/F/Flask/Flask-%{version}.tar… BuildRequires: fdupes -BuildRequires: python-devel BuildRequires: python-Jinja2 >= 2.4 +BuildRequires: python-devel # BuildRequires: python-Sphinx BuildRequires: python-Werkzeug >= 0.7 BuildRequires: python-click >= 2.0

1 0

commit iucode-tool for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '16

28 Nov '16

Hello community, here is the log from the commit of package iucode-tool for openSUSE:Factory checked in at 2016-11-28 15:06:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iucode-tool (Old) and /work/SRC/openSUSE:Factory/.iucode-tool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "iucode-tool" Changes: -------- --- /work/SRC/openSUSE:Factory/iucode-tool/iucode-tool.changes 2016-11-21 14:25:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.iucode-tool.new/iucode-tool.changes 2016-11-28 15:06:09.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Nov 24 10:12:08 UTC 2016 - mpluskal(a)suse.com + +- Update to version 2.1: + * iucode_tool: prepare for early-initramfs size minimization + * iucode_tool: add command line option to minimize early initramfs size + * iucode_tool(8): document --mini-earlyfw and --normal-earlyfw + * iucode_tool: cosmetic error path cleanup for write_cpio_header() + * iucode_tool: alternative bug-workaround for the early initramfs + * intel_microcode: constify and restyle function prototypes + * iucode_tool: constify function paramenters + * Makefile.am: ship CONTRIBUTING in the tarball + * Ready for release: v2.1 + +------------------------------------------------------------------- @@ -4 +18 @@ -- Update to version 1465064169.57e86a0: +- Update to version 1.6.1: Old: ---- iucode-tool-1.6.1.tar.xz New: ---- _servicedata iucode-tool-2.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iucode-tool.spec ++++++ --- /var/tmp/diff_new_pack.apmYnW/_old 2016-11-28 15:06:10.000000000 +0100 +++ /var/tmp/diff_new_pack.apmYnW/_new 2016-11-28 15:06:10.000000000 +0100 @@ -17,7 +17,7 @@ Name: iucode-tool -Version: 1.6.1 +Version: 2.1 Release: 0 Summary: A program to manipulate Intel microcode update collections License: GPL-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.apmYnW/_old 2016-11-28 15:06:10.000000000 +0100 +++ /var/tmp/diff_new_pack.apmYnW/_new 2016-11-28 15:06:10.000000000 +0100 @@ -4,8 +4,8 @@ <param name="scm">git</param> <param name="changesgenerate">enable</param> <param name="filename">iucode-tool</param> - <param name="revision">refs/tags/v1.6.1</param> - <param name="version">1.6.1</param> + <param name="revision">refs/tags/v2.1</param> + <param name="version">2.1</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://gitlab.com/iucode-tool/iucode-tool.git</param> <param name="changesrevision">9a876dc19208f8b01159e94f7120b6f08a4bdb5d</param></service></servicedata>++++++ iucode-tool-1.6.1.tar.xz -> iucode-tool-2.1.tar.xz ++++++ ++++ 2744 lines of diff (skipped)

1 0

commit radeontop for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '16

28 Nov '16

Hello community, here is the log from the commit of package radeontop for openSUSE:Factory checked in at 2016-11-28 15:06:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/radeontop (Old) and /work/SRC/openSUSE:Factory/.radeontop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "radeontop" Changes: -------- --- /work/SRC/openSUSE:Factory/radeontop/radeontop.changes 2016-07-15 12:51:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.radeontop.new/radeontop.changes 2016-11-28 15:06:01.000000000 +0100 @@ -1,0 +2,15 @@ +Thu Nov 24 08:11:12 UTC 2016 - mpluskal(a)suse.com + +- Update to version 0.9+git.20161028: + * Add optional unprivileged mode in Xorg + * Fix auto-detection of radeon device + * Add a LIBDIR indirection for some x86_64 systems + * Add support for Polaris 11 and Polaris 10 + * Add support for VRAM size and usage reporting on amdgpu + * Print "amdgpu not enabled" warning just once + * Add support for resizeable terminals + * Fix artifact on mrxvt + * ui: factor out screen size calculation + * Silence gcc's "may be uninitialized" warning + +------------------------------------------------------------------- Old: ---- radeontop-0.9.tar.gz New: ---- _service _servicedata radeontop-0.9+git.20161028.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ radeontop.spec ++++++ --- /var/tmp/diff_new_pack.rA6wPZ/_old 2016-11-28 15:06:02.000000000 +0100 +++ /var/tmp/diff_new_pack.rA6wPZ/_new 2016-11-28 15:06:02.000000000 +0100 @@ -17,18 +17,20 @@ Name: radeontop -Version: 0.9 +Version: 0.9+git.20161028 Release: 0 Summary: View Radeon GPU utilization License: GPL-3.0 Group: System/Monitoring Url: https://github.com/clbr/radeontop -Source: https://github.com/clbr/radeontop/archive/v%{version}.tar.gz#/%{name}-%{ver… -BuildRequires: ncurses-devel +Source: %{name}-%{version}.tar.xz BuildRequires: pkgconfig -BuildRequires: pkgconfig(libdrm) +BuildRequires: pkgconfig(libdrm) >= 2.4.63 +BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(pciaccess) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(xcb-dri2) +Recommends: %{name}-lang = %{version} %description View Radeon GPU utilization, both for the total activity percent and individual @@ -38,22 +40,27 @@ The total GPU utilization is also valid for OpenCL loads; the other blocks are only useful in GL loads. +%lang_package + %prep %setup -q %build export CFLAGS="%{optflags}" -make %{?_smp_mflags} +make %{?_smp_mflags} amdgpu=1 %install -%make_install - +%make_install LIBDIR=%{_lib} %find_lang %{name} -%files -f %{name}.lang +%files %defattr(-,root,root,-) %doc COPYING README.md %{_sbindir}/radeontop +%{_libdir}/libradeontop_xcb.so %{_mandir}/man1/radeontop.1%{ext_man} +%files lang -f %{name}.lang +%defattr(-,root,root,-) + %changelog ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <param name="url">https://github.com/clbr/radeontop.git</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> <param name="filename">radeontop</param> <param name="versionformat">0.9+git.%cd</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service mode="disabled" name="set_version"/> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/clbr/radeontop.git</param> <param name="changesrevision">c0abadf3cd07eb2b5e5ad694f680705c7b1c764e</param></service></servicedata>

1 0

commit ofono for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '16

28 Nov '16

Hello community, here is the log from the commit of package ofono for openSUSE:Factory checked in at 2016-11-28 15:05:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ofono (Old) and /work/SRC/openSUSE:Factory/.ofono.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ofono" Changes: -------- --- /work/SRC/openSUSE:Factory/ofono/ofono.changes 2016-06-14 23:08:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ofono.new/ofono.changes 2016-11-28 15:05:54.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Nov 24 08:04:26 UTC 2016 - mpluskal(a)suse.com + +- Update to version 1.19: + * Fix issue with DHCP parsing and Huawei modems. + * Fix issue with detecting Huawei E3372 modem. + * Fix issue with handling serving cell info. + * Fix issue with handling SIM SC facility lock. + * Fix issue with Android RIL PIN retry logic. + * Fix issue with Android RIL and RAT handling. + * Add support for Android RIL cell broadcast. + * Add support for SoFIA 3GR thermal management. + +------------------------------------------------------------------- Old: ---- ofono-1.18.tar.xz New: ---- ofono-1.19.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ofono.spec ++++++ --- /var/tmp/diff_new_pack.D9unn6/_old 2016-11-28 15:05:55.000000000 +0100 +++ /var/tmp/diff_new_pack.D9unn6/_new 2016-11-28 15:05:55.000000000 +0100 @@ -19,7 +19,7 @@ Name: ofono -Version: 1.18 +Version: 1.19 Release: 0 Summary: Open Source Telephony License: GPL-2.0 @@ -79,10 +79,8 @@ --with-systemdunitdir="%{_libexecdir}/systemd/system" make %{?_smp_mflags} V=1 -%check check %{?_smp_mflags} - %install -make %{?_smp_mflags} DESTDIR=%{buildroot} install +%make_install ln -sv %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} ++++++ ofono-1.18.tar.xz -> ofono-1.19.tar.xz ++++++ ++++ 3010 lines of diff (skipped)

1 0

commit opencl-headers for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '16

28 Nov '16

Hello community, here is the log from the commit of package opencl-headers for openSUSE:Factory checked in at 2016-11-28 15:05:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opencl-headers (Old) and /work/SRC/openSUSE:Factory/.opencl-headers.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opencl-headers" Changes: -------- --- /work/SRC/openSUSE:Factory/opencl-headers/opencl-headers.changes 2016-07-01 10:01:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.opencl-headers.new/opencl-headers.changes 2016-11-28 15:05:47.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Nov 24 07:58:07 UTC 2016 - mpluskal(a)suse.com + +- Update to version 2.2+git.20161018: + * added CL_DEVICE_HALF_FP_CONFIG define + * Fix gcc -Wundef warning + * cl_halfn declarations + * added headers for Intel vendor extensions + * Add tokens for cl_img_use_gralloc_ptr, cl_img_cached_allocations and cl_img_yuv_image extensions (#13) + +------------------------------------------------------------------- Old: ---- opencl-headers-2.2+git.20160614.tar.xz New: ---- _servicedata opencl-headers-2.2+git.20161018.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opencl-headers.spec ++++++ --- /var/tmp/diff_new_pack.pPIQ0O/_old 2016-11-28 15:05:48.000000000 +0100 +++ /var/tmp/diff_new_pack.pPIQ0O/_new 2016-11-28 15:05:48.000000000 +0100 @@ -17,7 +17,7 @@ Name: opencl-headers -Version: 2.2+git.20160614 +Version: 2.2+git.20161018 Release: 0 Summary: OpenCL (Open Computing Language) headers License: MIT @@ -43,8 +43,8 @@ %build %install -install -d -m 755 %{buildroot}%{_includedir}/CL -install -m644 *.h* %{buildroot}%{_includedir}/CL +install -d -m 0755 %{buildroot}%{_includedir}/CL +install -p -m 0644 *.h* %{buildroot}%{_includedir}/CL %files %defattr(-,root,root) ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/KhronosGroup/OpenCL-Headers.git</param> <param name="changesrevision">2d06e097f3dc61ce3ceeafeec203e9ee9e68f330</param></service></servicedata>++++++ opencl-headers-2.2+git.20160614.tar.xz -> opencl-headers-2.2+git.20161018.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opencl-headers-2.2+git.20160614/cl.h new/opencl-headers-2.2+git.20161018/cl.h --- old/opencl-headers-2.2+git.20160614/cl.h 2016-06-30 10:59:52.000000000 +0200 +++ new/opencl-headers-2.2+git.20161018/cl.h 2016-10-18 18:18:31.000000000 +0200 @@ -279,7 +279,7 @@ #define CL_DEVICE_EXTENSIONS 0x1030 #define CL_DEVICE_PLATFORM 0x1031 #define CL_DEVICE_DOUBLE_FP_CONFIG 0x1032 -/* 0x1033 reserved for CL_DEVICE_HALF_FP_CONFIG */ +#define CL_DEVICE_HALF_FP_CONFIG 0x1033 #define CL_DEVICE_PREFERRED_VECTOR_WIDTH_HALF 0x1034 #define CL_DEVICE_HOST_UNIFIED_MEMORY 0x1035 /* deprecated */ #define CL_DEVICE_NATIVE_VECTOR_WIDTH_CHAR 0x1036 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opencl-headers-2.2+git.20160614/cl_dx9_media_sharing_intel.h new/opencl-headers-2.2+git.20161018/cl_dx9_media_sharing_intel.h --- old/opencl-headers-2.2+git.20160614/cl_dx9_media_sharing_intel.h 1970-01-01 01:00:00.000000000 +0100 +++ new/opencl-headers-2.2+git.20161018/cl_dx9_media_sharing_intel.h 2016-10-18 18:18:31.000000000 +0200 @@ -0,0 +1,182 @@ +/********************************************************************************** + * Copyright (c) 2008-2016 The Khronos Group Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and/or associated documentation files (the + * "Materials"), to deal in the Materials without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Materials, and to + * permit persons to whom the Materials are 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 Materials. + * + * MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS + * KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS + * SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT + * https://www.khronos.org/registry/ + * + * THE MATERIALS ARE 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 + * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + **********************************************************************************/ +/*****************************************************************************\ + +Copyright (c) 2013-2016 Intel Corporation All Rights Reserved. + +THESE MATERIALS ARE PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR ITS +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THESE +MATERIALS, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +File Name: cl_dx9_media_sharing_intel.h + +Abstract: + +Notes: + +\*****************************************************************************/ + +#ifndef __OPENCL_CL_DX9_MEDIA_SHARING_INTEL_H +#define __OPENCL_CL_DX9_MEDIA_SHARING_INTEL_H + +#include <CL/cl.h> +#include <CL/cl_platform.h> +#include <d3d9.h> +#include <dxvahd.h> +#include <wtypes.h> +#include <d3d9types.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/*************************************** +* cl_intel_dx9_media_sharing extension * +****************************************/ + +#define cl_intel_dx9_media_sharing 1 + +typedef cl_uint cl_dx9_device_source_intel; +typedef cl_uint cl_dx9_device_set_intel; + +/* error codes */ +#define CL_INVALID_DX9_DEVICE_INTEL -1010 +#define CL_INVALID_DX9_RESOURCE_INTEL -1011 +#define CL_DX9_RESOURCE_ALREADY_ACQUIRED_INTEL -1012 +#define CL_DX9_RESOURCE_NOT_ACQUIRED_INTEL -1013 + +/* cl_dx9_device_source_intel */ +#define CL_D3D9_DEVICE_INTEL 0x4022 +#define CL_D3D9EX_DEVICE_INTEL 0x4070 +#define CL_DXVA_DEVICE_INTEL 0x4071 + +/* cl_dx9_device_set_intel */ +#define CL_PREFERRED_DEVICES_FOR_DX9_INTEL 0x4024 +#define CL_ALL_DEVICES_FOR_DX9_INTEL 0x4025 + +/* cl_context_info */ +#define CL_CONTEXT_D3D9_DEVICE_INTEL 0x4026 +#define CL_CONTEXT_D3D9EX_DEVICE_INTEL 0x4072 +#define CL_CONTEXT_DXVA_DEVICE_INTEL 0x4073 + +/* cl_mem_info */ +#define CL_MEM_DX9_RESOURCE_INTEL 0x4027 +#define CL_MEM_DX9_SHARED_HANDLE_INTEL 0x4074 + +/* cl_image_info */ +#define CL_IMAGE_DX9_PLANE_INTEL 0x4075 + +/* cl_command_type */ +#define CL_COMMAND_ACQUIRE_DX9_OBJECTS_INTEL 0x402A +#define CL_COMMAND_RELEASE_DX9_OBJECTS_INTEL 0x402B +/******************************************************************************/ + +extern CL_API_ENTRY cl_int CL_API_CALL +clGetDeviceIDsFromDX9INTEL( + cl_platform_id /* platform */, + cl_dx9_device_source_intel /* dx9_device_source */, + void* /* dx9_object */, + cl_dx9_device_set_intel /* dx9_device_set */, + cl_uint /* num_entries */, + cl_device_id* /* devices */, + cl_uint* /* num_devices */) CL_EXT_SUFFIX__VERSION_1_1; + +typedef CL_API_ENTRY cl_int (CL_API_CALL* clGetDeviceIDsFromDX9INTEL_fn)( + cl_platform_id /* platform */, + cl_dx9_device_source_intel /* dx9_device_source */, + void* /* dx9_object */, + cl_dx9_device_set_intel /* dx9_device_set */, + cl_uint /* num_entries */, + cl_device_id* /* devices */, + cl_uint* /* num_devices */) CL_EXT_SUFFIX__VERSION_1_1; + +extern CL_API_ENTRY cl_mem CL_API_CALL +clCreateFromDX9MediaSurfaceINTEL( + cl_context /* context */, + cl_mem_flags /* flags */, + IDirect3DSurface9* /* resource */, + HANDLE /* sharedHandle */, + UINT /* plane */, + cl_int* /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1; + +typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromDX9MediaSurfaceINTEL_fn)( + cl_context /* context */, + cl_mem_flags /* flags */, + IDirect3DSurface9* /* resource */, + HANDLE /* sharedHandle */, + UINT /* plane */, + cl_int* /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1; + +extern CL_API_ENTRY cl_int CL_API_CALL +clEnqueueAcquireDX9ObjectsINTEL( + cl_command_queue /* command_queue */, + cl_uint /* num_objects */, + const cl_mem* /* mem_objects */, + cl_uint /* num_events_in_wait_list */, + const cl_event* /* event_wait_list */, + cl_event* /* event */) CL_EXT_SUFFIX__VERSION_1_1; + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireDX9ObjectsINTEL_fn)( + cl_command_queue /* command_queue */, + cl_uint /* num_objects */, + const cl_mem* /* mem_objects */, + cl_uint /* num_events_in_wait_list */, + const cl_event* /* event_wait_list */, + cl_event* /* event */) CL_EXT_SUFFIX__VERSION_1_1; + +extern CL_API_ENTRY cl_int CL_API_CALL +clEnqueueReleaseDX9ObjectsINTEL( + cl_command_queue /* command_queue */, + cl_uint /* num_objects */, + cl_mem* /* mem_objects */, + cl_uint /* num_events_in_wait_list */, + const cl_event* /* event_wait_list */, + cl_event* /* event */) CL_EXT_SUFFIX__VERSION_1_1; + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseDX9ObjectsINTEL_fn)( + cl_command_queue /* command_queue */, + cl_uint /* num_objects */, + cl_mem* /* mem_objects */, + cl_uint /* num_events_in_wait_list */, + const cl_event* /* event_wait_list */, + cl_event* /* event */) CL_EXT_SUFFIX__VERSION_1_1; + +#ifdef __cplusplus +} +#endif + +#endif /* __OPENCL_CL_DX9_MEDIA_SHARING_INTEL_H */ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opencl-headers-2.2+git.20160614/cl_ext.h new/opencl-headers-2.2+git.20161018/cl_ext.h --- old/opencl-headers-2.2+git.20160614/cl_ext.h 2016-06-30 10:59:52.000000000 +0200 +++ new/opencl-headers-2.2+git.20161018/cl_ext.h 2016-10-18 18:18:31.000000000 +0200 @@ -313,6 +313,55 @@ #endif /* CL_VERSION_1_1 */ +#if defined(CL_VERSION_1_2) + +/****************************************** + * cl_img_yuv_image extension * + ******************************************/ + +/* Image formats used in clCreateImage */ +#define CL_NV21_IMG 0x40D0 +#define CL_YV12_IMG 0x40D1 + +/****************************************** + * cl_img_cached_allocations extension * + ******************************************/ + +/* Flag values used by clCreteBuffer */ +#define CL_MEM_USE_UNCACHED_CPU_MEMORY_IMG (1 << 26) +#define CL_MEM_USE_CACHED_CPU_MEMORY_IMG (1 << 27) + +/****************************************** + * cl_img_use_gralloc_ptr extension * + ******************************************/ + +/* Flag values used by clCreteBuffer */ +#define CL_MEM_USE_GRALLOC_PTR_IMG (1 << 28) + +/* To be used by clGetEventInfo: */ +#define CL_COMMAND_ACQUIRE_GRALLOC_OBJECTS_IMG 0x40D2 +#define CL_COMMAND_RELEASE_GRALLOC_OBJECTS_IMG 0x40D3 + +/* Error code from clEnqueueReleaseGrallocObjectsIMG */ +#define CL_GRALLOC_RESOURCE_NOT_ACQUIRED_IMG 0x40D4 + +extern CL_API_ENTRY cl_int CL_API_CALL +clEnqueueAcquireGrallocObjectsIMG(cl_command_queue /* command_queue */, + cl_uint /* num_objects */, + const cl_mem * /* mem_objects */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_EXT_SUFFIX__VERSION_1_2; + +extern CL_API_ENTRY cl_int CL_API_CALL +clEnqueueReleaseGrallocObjectsIMG(cl_command_queue /* command_queue */, + cl_uint /* num_objects */, + const cl_mem * /* mem_objects */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_EXT_SUFFIX__VERSION_1_2; + +#endif /* CL_VERSION_1_2 */ #ifdef CL_VERSION_2_0 /********************************* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opencl-headers-2.2+git.20160614/cl_ext_intel.h new/opencl-headers-2.2+git.20161018/cl_ext_intel.h --- old/opencl-headers-2.2+git.20160614/cl_ext_intel.h 1970-01-01 01:00:00.000000000 +0100 +++ new/opencl-headers-2.2+git.20161018/cl_ext_intel.h 2016-10-18 18:18:31.000000000 +0200 @@ -0,0 +1,286 @@ +/******************************************************************************* + * Copyright (c) 2008-2016 The Khronos Group Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and/or associated documentation files (the + * "Materials"), to deal in the Materials without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Materials, and to + * permit persons to whom the Materials are 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 Materials. + * + * MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS + * KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS + * SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT + * https://www.khronos.org/registry/ + * + * THE MATERIALS ARE 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 + * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + ******************************************************************************/ +/*****************************************************************************\ + +Copyright (c) 2013-2016 Intel Corporation All Rights Reserved. + +THESE MATERIALS ARE PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR ITS +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THESE +MATERIALS, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +File Name: cl_ext_intel.h + +Abstract: + +Notes: + +\*****************************************************************************/ + +#ifndef __CL_EXT_INTEL_H +#define __CL_EXT_INTEL_H + +#ifdef __APPLE__ + #include <OpenCL/cl.h> + #include <OpenCL/cl_platform.h> +#else + #include <CL/cl.h> + #include <CL/cl_platform.h> +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/*************************************** +* cl_intel_thread_local_exec extension * +****************************************/ + +#define cl_intel_thread_local_exec 1 + +#define CL_QUEUE_THREAD_LOCAL_EXEC_ENABLE_INTEL (((cl_bitfield)1) << 31) + +/*********************************************** +* cl_intel_device_partition_by_names extension * +************************************************/ + +#define cl_intel_device_partition_by_names 1 + +#define CL_DEVICE_PARTITION_BY_NAMES_INTEL 0x4052 +#define CL_PARTITION_BY_NAMES_LIST_END_INTEL -1 + +/************************************************ +* cl_intel_accelerator extension * +* cl_intel_motion_estimation extension * +* cl_intel_advanced_motion_estimation extension * +*************************************************/ + +#define cl_intel_accelerator 1 +#define cl_intel_motion_estimation 1 +#define cl_intel_advanced_motion_estimation 1 + +typedef struct _cl_accelerator_intel* cl_accelerator_intel; +typedef cl_uint cl_accelerator_type_intel; +typedef cl_uint cl_accelerator_info_intel; + +typedef struct _cl_motion_estimation_desc_intel { + cl_uint mb_block_type; + cl_uint subpixel_mode; + cl_uint sad_adjust_mode; + cl_uint search_path_type; +} cl_motion_estimation_desc_intel; + +/* error codes */ +#define CL_INVALID_ACCELERATOR_INTEL -1094 +#define CL_INVALID_ACCELERATOR_TYPE_INTEL -1095 +#define CL_INVALID_ACCELERATOR_DESCRIPTOR_INTEL -1096 +#define CL_ACCELERATOR_TYPE_NOT_SUPPORTED_INTEL -1097 + +/* cl_accelerator_type_intel */ +#define CL_ACCELERATOR_TYPE_MOTION_ESTIMATION_INTEL 0x0 + +/* cl_accelerator_info_intel */ +#define CL_ACCELERATOR_DESCRIPTOR_INTEL 0x4090 +#define CL_ACCELERATOR_REFERENCE_COUNT_INTEL 0x4091 +#define CL_ACCELERATOR_CONTEXT_INTEL 0x4092 +#define CL_ACCELERATOR_TYPE_INTEL 0x4093 + +/* cl_motion_detect_desc_intel flags */ +#define CL_ME_MB_TYPE_16x16_INTEL 0x0 +#define CL_ME_MB_TYPE_8x8_INTEL 0x1 +#define CL_ME_MB_TYPE_4x4_INTEL 0x2 + +#define CL_ME_SUBPIXEL_MODE_INTEGER_INTEL 0x0 +#define CL_ME_SUBPIXEL_MODE_HPEL_INTEL 0x1 +#define CL_ME_SUBPIXEL_MODE_QPEL_INTEL 0x2 + +#define CL_ME_SAD_ADJUST_MODE_NONE_INTEL 0x0 +#define CL_ME_SAD_ADJUST_MODE_HAAR_INTEL 0x1 + +#define CL_ME_SEARCH_PATH_RADIUS_2_2_INTEL 0x0 +#define CL_ME_SEARCH_PATH_RADIUS_4_4_INTEL 0x1 +#define CL_ME_SEARCH_PATH_RADIUS_16_12_INTEL 0x5 + +#define CL_ME_SKIP_BLOCK_TYPE_16x16_INTEL 0x0 +#define CL_ME_CHROMA_INTRA_PREDICT_ENABLED_INTEL 0x1 +#define CL_ME_LUMA_INTRA_PREDICT_ENABLED_INTEL 0x2 +#define CL_ME_SKIP_BLOCK_TYPE_8x8_INTEL 0x4 + +#define CL_ME_FORWARD_INPUT_MODE_INTEL 0x1 +#define CL_ME_BACKWARD_INPUT_MODE_INTEL 0x2 +#define CL_ME_BIDIRECTION_INPUT_MODE_INTEL 0x3 + +#define CL_ME_BIDIR_WEIGHT_QUARTER_INTEL 16 +#define CL_ME_BIDIR_WEIGHT_THIRD_INTEL 21 +#define CL_ME_BIDIR_WEIGHT_HALF_INTEL 32 +#define CL_ME_BIDIR_WEIGHT_TWO_THIRD_INTEL 43 +#define CL_ME_BIDIR_WEIGHT_THREE_QUARTER_INTEL 48 + +#define CL_ME_COST_PENALTY_NONE_INTEL 0x0 +#define CL_ME_COST_PENALTY_LOW_INTEL 0x1 +#define CL_ME_COST_PENALTY_NORMAL_INTEL 0x2 +#define CL_ME_COST_PENALTY_HIGH_INTEL 0x3 + +#define CL_ME_COST_PRECISION_QPEL_INTEL 0x0 +#define CL_ME_COST_PRECISION_HPEL_INTEL 0x1 +#define CL_ME_COST_PRECISION_PEL_INTEL 0x2 +#define CL_ME_COST_PRECISION_DPEL_INTEL 0x3 + +#define CL_ME_LUMA_PREDICTOR_MODE_VERTICAL_INTEL 0x0 +#define CL_ME_LUMA_PREDICTOR_MODE_HORIZONTAL_INTEL 0x1 +#define CL_ME_LUMA_PREDICTOR_MODE_DC_INTEL 0x2 +#define CL_ME_LUMA_PREDICTOR_MODE_DIAGONAL_DOWN_LEFT_INTEL 0x3 + +#define CL_ME_LUMA_PREDICTOR_MODE_DIAGONAL_DOWN_RIGHT_INTEL 0x4 +#define CL_ME_LUMA_PREDICTOR_MODE_PLANE_INTEL 0x4 +#define CL_ME_LUMA_PREDICTOR_MODE_VERTICAL_RIGHT_INTEL 0x5 +#define CL_ME_LUMA_PREDICTOR_MODE_HORIZONTAL_DOWN_INTEL 0x6 +#define CL_ME_LUMA_PREDICTOR_MODE_VERTICAL_LEFT_INTEL 0x7 +#define CL_ME_LUMA_PREDICTOR_MODE_HORIZONTAL_UP_INTEL 0x8 + +#define CL_ME_CHROMA_PREDICTOR_MODE_DC_INTEL 0x0 +#define CL_ME_CHROMA_PREDICTOR_MODE_HORIZONTAL_INTEL 0x1 +#define CL_ME_CHROMA_PREDICTOR_MODE_VERTICAL_INTEL 0x2 +#define CL_ME_CHROMA_PREDICTOR_MODE_PLANE_INTEL 0x3 + +/* cl_device_info */ +#define CL_DEVICE_ME_VERSION_INTEL 0x407E + +#define CL_ME_VERSION_LEGACY_INTEL 0x0 +#define CL_ME_VERSION_ADVANCED_VER_1_INTEL 0x1 +#define CL_ME_VERSION_ADVANCED_VER_2_INTEL 0x2 + +extern CL_API_ENTRY cl_accelerator_intel CL_API_CALL +clCreateAcceleratorINTEL( + cl_context /* context */, + cl_accelerator_type_intel /* accelerator_type */, + size_t /* descriptor_size */, + const void* /* descriptor */, + cl_int* /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_accelerator_intel (CL_API_CALL *clCreateAcceleratorINTEL_fn)( + cl_context /* context */, + cl_accelerator_type_intel /* accelerator_type */, + size_t /* descriptor_size */, + const void* /* descriptor */, + cl_int* /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_2; + +extern CL_API_ENTRY cl_int CL_API_CALL +clGetAcceleratorInfoINTEL( + cl_accelerator_intel /* accelerator */, + cl_accelerator_info_intel /* param_name */, + size_t /* param_value_size */, + void* /* param_value */, + size_t* /* param_value_size_ret */) CL_EXT_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetAcceleratorInfoINTEL_fn)( + cl_accelerator_intel /* accelerator */, + cl_accelerator_info_intel /* param_name */, + size_t /* param_value_size */, + void* /* param_value */, + size_t* /* param_value_size_ret */) CL_EXT_SUFFIX__VERSION_1_2; + +extern CL_API_ENTRY cl_int CL_API_CALL +clRetainAcceleratorINTEL( + cl_accelerator_intel /* accelerator */) CL_EXT_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clRetainAcceleratorINTEL_fn)( + cl_accelerator_intel /* accelerator */) CL_EXT_SUFFIX__VERSION_1_2; + +extern CL_API_ENTRY cl_int CL_API_CALL +clReleaseAcceleratorINTEL( + cl_accelerator_intel /* accelerator */) CL_EXT_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clReleaseAcceleratorINTEL_fn)( + cl_accelerator_intel /* accelerator */) CL_EXT_SUFFIX__VERSION_1_2; + +/****************************************** +* cl_intel_simultaneous_sharing extension * +*******************************************/ + +#define cl_intel_simultaneous_sharing 1 + +#define CL_DEVICE_SIMULTANEOUS_INTEROPS_INTEL 0x4104 +#define CL_DEVICE_NUM_SIMULTANEOUS_INTEROPS_INTEL 0x4105 + +/*********************************** +* cl_intel_egl_image_yuv extension * +************************************/ + +#define cl_intel_egl_image_yuv 1 + +#define CL_EGL_YUV_PLANE_INTEL 0x4107 + +/******************************** +* cl_intel_packed_yuv extension * +*********************************/ + +#define cl_intel_packed_yuv 1 + +#define CL_YUYV_INTEL 0x4076 +#define CL_UYVY_INTEL 0x4077 +#define CL_YVYU_INTEL 0x4078 +#define CL_VYUY_INTEL 0x4079 + +/******************************************** +* cl_intel_required_subgroup_size extension * +*********************************************/ + +#define cl_intel_required_subgroup_size 1 + +#define CL_DEVICE_SUB_GROUP_SIZES_INTEL 0x4108 +#define CL_KERNEL_SPILL_MEM_SIZE_INTEL 0x4109 +#define CL_KERNEL_COMPILE_SUB_GROUP_SIZE_INTEL 0x410A + +/**************************************** +* cl_intel_driver_diagnostics extension * +*****************************************/ + +#define cl_intel_driver_diagnostics 1 + +typedef cl_uint cl_diagnostics_verbose_level; + +#define CL_CONTEXT_SHOW_DIAGNOSTICS_INTEL 0x4106 + +#define CL_CONTEXT_DIAGNOSTICS_LEVEL_ALL_INTEL ( 0xff ) +#define CL_CONTEXT_DIAGNOSTICS_LEVEL_GOOD_INTEL ( 1 ) +#define CL_CONTEXT_DIAGNOSTICS_LEVEL_BAD_INTEL ( 1 << 1 ) +#define CL_CONTEXT_DIAGNOSTICS_LEVEL_NEUTRAL_INTEL ( 1 << 2 ) + +#ifdef __cplusplus +} +#endif + +#endif /* __CL_EXT_INTEL_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opencl-headers-2.2+git.20160614/cl_platform.h new/opencl-headers-2.2+git.20161018/cl_platform.h --- old/opencl-headers-2.2+git.20160614/cl_platform.h 2016-06-30 10:59:52.000000000 +0200 +++ new/opencl-headers-2.2+git.20161018/cl_platform.h 2016-10-18 18:18:31.000000000 +0200 @@ -510,15 +510,17 @@ #if defined( __GNUC__) && ! defined( __STRICT_ANSI__ ) #define __CL_HAS_ANON_STRUCT__ 1 #define __CL_ANON_STRUCT__ __extension__ -#elif defined( _WIN32) && (_MSC_VER >= 1500) +#elif defined( _WIN32) && defined(_MSC_VER) + #if _MSC_VER >= 1500 /* Microsoft Developer Studio 2008 supports anonymous structs, but * complains by default. */ -#define __CL_HAS_ANON_STRUCT__ 1 -#define __CL_ANON_STRUCT__ + #define __CL_HAS_ANON_STRUCT__ 1 + #define __CL_ANON_STRUCT__ /* Disable warning C4201: nonstandard extension used : nameless * struct/union */ -#pragma warning( push ) -#pragma warning( disable : 4201 ) + #pragma warning( push ) + #pragma warning( disable : 4201 ) + #endif #else #define __CL_HAS_ANON_STRUCT__ 0 #define __CL_ANON_STRUCT__ @@ -847,6 +849,81 @@ #endif }cl_ushort16; + +/* ---- cl_halfn ---- */ +typedef union +{ + cl_half CL_ALIGNED(4) s[2]; +#if __CL_HAS_ANON_STRUCT__ + __CL_ANON_STRUCT__ struct{ cl_half x, y; }; + __CL_ANON_STRUCT__ struct{ cl_half s0, s1; }; + __CL_ANON_STRUCT__ struct{ cl_half lo, hi; }; +#endif +#if defined( __CL_HALF2__) + __cl_half2 v2; +#endif +}cl_half2; + +typedef union +{ + cl_half CL_ALIGNED(8) s[4]; +#if __CL_HAS_ANON_STRUCT__ + __CL_ANON_STRUCT__ struct{ cl_half x, y, z, w; }; + __CL_ANON_STRUCT__ struct{ cl_half s0, s1, s2, s3; }; + __CL_ANON_STRUCT__ struct{ cl_half2 lo, hi; }; +#endif +#if defined( __CL_HALF2__) + __cl_half2 v2[2]; +#endif +#if defined( __CL_HALF4__) + __cl_half4 v4; +#endif +}cl_half4; + +/* cl_half3 is identical in size, alignment and behavior to cl_half4. See section 6.1.5. */ +typedef cl_half4 cl_half3; + +typedef union +{ + cl_half CL_ALIGNED(16) s[8]; +#if __CL_HAS_ANON_STRUCT__ + __CL_ANON_STRUCT__ struct{ cl_half x, y, z, w; }; + __CL_ANON_STRUCT__ struct{ cl_half s0, s1, s2, s3, s4, s5, s6, s7; }; + __CL_ANON_STRUCT__ struct{ cl_half4 lo, hi; }; +#endif +#if defined( __CL_HALF2__) + __cl_half2 v2[4]; +#endif +#if defined( __CL_HALF4__) + __cl_half4 v4[2]; +#endif +#if defined( __CL_HALF8__ ) + __cl_half8 v8; +#endif +}cl_half8; + +typedef union +{ + cl_half CL_ALIGNED(32) s[16]; +#if __CL_HAS_ANON_STRUCT__ + __CL_ANON_STRUCT__ struct{ cl_half x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; }; + __CL_ANON_STRUCT__ struct{ cl_half s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; }; + __CL_ANON_STRUCT__ struct{ cl_half8 lo, hi; }; +#endif +#if defined( __CL_HALF2__) + __cl_half2 v2[8]; +#endif +#if defined( __CL_HALF4__) + __cl_half4 v4[4]; +#endif +#if defined( __CL_HALF8__ ) + __cl_half8 v8[2]; +#endif +#if defined( __CL_HALF16__ ) + __cl_half16 v16; +#endif +}cl_half16; + /* ---- cl_intn ---- */ typedef union { @@ -1326,8 +1403,10 @@ #undef __CL_HAS_ANON_STRUCT__ #undef __CL_ANON_STRUCT__ -#if defined( _WIN32) && (_MSC_VER >= 1500) -#pragma warning( pop ) +#if defined( _WIN32) && defined(_MSC_VER) + #if _MSC_VER >=1500 + #pragma warning( pop ) + #endif #endif #endif /* __CL_PLATFORM_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opencl-headers-2.2+git.20160614/cl_va_api_media_sharing_intel.h new/opencl-headers-2.2+git.20161018/cl_va_api_media_sharing_intel.h --- old/opencl-headers-2.2+git.20160614/cl_va_api_media_sharing_intel.h 1970-01-01 01:00:00.000000000 +0100 +++ new/opencl-headers-2.2+git.20161018/cl_va_api_media_sharing_intel.h 2016-10-18 18:18:31.000000000 +0200 @@ -0,0 +1,172 @@ +/********************************************************************************** + * Copyright (c) 2008-2016 The Khronos Group Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and/or associated documentation files (the + * "Materials"), to deal in the Materials without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Materials, and to + * permit persons to whom the Materials are 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 Materials. + * + * MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS + * KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS + * SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT + * https://www.khronos.org/registry/ + * + * THE MATERIALS ARE 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 + * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + **********************************************************************************/ +/*****************************************************************************\ + +Copyright (c) 2013-2016 Intel Corporation All Rights Reserved. + +THESE MATERIALS ARE PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR ITS +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THESE +MATERIALS, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +File Name: cl_va_api_media_sharing_intel.h + +Abstract: + +Notes: + +\*****************************************************************************/ + + +#ifndef __OPENCL_CL_VA_API_MEDIA_SHARING_INTEL_H +#define __OPENCL_CL_VA_API_MEDIA_SHARING_INTEL_H + +#include <CL/cl.h> +#include <CL/cl_platform.h> +#include <va/va.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/****************************************** +* cl_intel_va_api_media_sharing extension * +*******************************************/ + +#define cl_intel_va_api_media_sharing 1 + +/* error codes */ +#define CL_INVALID_VA_API_MEDIA_ADAPTER_INTEL -1098 +#define CL_INVALID_VA_API_MEDIA_SURFACE_INTEL -1099 +#define CL_VA_API_MEDIA_SURFACE_ALREADY_ACQUIRED_INTEL -1100 +#define CL_VA_API_MEDIA_SURFACE_NOT_ACQUIRED_INTEL -1101 + +/* cl_va_api_device_source_intel */ +#define CL_VA_API_DISPLAY_INTEL 0x4094 + +/* cl_va_api_device_set_intel */ +#define CL_PREFERRED_DEVICES_FOR_VA_API_INTEL 0x4095 +#define CL_ALL_DEVICES_FOR_VA_API_INTEL 0x4096 + +/* cl_context_info */ +#define CL_CONTEXT_VA_API_DISPLAY_INTEL 0x4097 + +/* cl_mem_info */ +#define CL_MEM_VA_API_MEDIA_SURFACE_INTEL 0x4098 + +/* cl_image_info */ +#define CL_IMAGE_VA_API_PLANE_INTEL 0x4099 + +/* cl_command_type */ +#define CL_COMMAND_ACQUIRE_VA_API_MEDIA_SURFACES_INTEL 0x409A +#define CL_COMMAND_RELEASE_VA_API_MEDIA_SURFACES_INTEL 0x409B + +typedef cl_uint cl_va_api_device_source_intel; +typedef cl_uint cl_va_api_device_set_intel; + +extern CL_API_ENTRY cl_int CL_API_CALL +clGetDeviceIDsFromVA_APIMediaAdapterINTEL( + cl_platform_id /* platform */, + cl_va_api_device_source_intel /* media_adapter_type */, + void* /* media_adapter */, + cl_va_api_device_set_intel /* media_adapter_set */, + cl_uint /* num_entries */, + cl_device_id* /* devices */, + cl_uint* /* num_devices */) CL_EXT_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * clGetDeviceIDsFromVA_APIMediaAdapterINTEL_fn)( + cl_platform_id /* platform */, + cl_va_api_device_source_intel /* media_adapter_type */, + void* /* media_adapter */, + cl_va_api_device_set_intel /* media_adapter_set */, + cl_uint /* num_entries */, + cl_device_id* /* devices */, + cl_uint* /* num_devices */) CL_EXT_SUFFIX__VERSION_1_2; + +extern CL_API_ENTRY cl_mem CL_API_CALL +clCreateFromVA_APIMediaSurfaceINTEL( + cl_context /* context */, + cl_mem_flags /* flags */, + VASurfaceID* /* surface */, + cl_uint /* plane */, + cl_int* /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_mem (CL_API_CALL * clCreateFromVA_APIMediaSurfaceINTEL_fn)( + cl_context /* context */, + cl_mem_flags /* flags */, + VASurfaceID* /* surface */, + cl_uint /* plane */, + cl_int* /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_2; + +extern CL_API_ENTRY cl_int CL_API_CALL +clEnqueueAcquireVA_APIMediaSurfacesINTEL( + cl_command_queue /* command_queue */, + cl_uint /* num_objects */, + const cl_mem* /* mem_objects */, + cl_uint /* num_events_in_wait_list */, + const cl_event* /* event_wait_list */, + cl_event* /* event */) CL_EXT_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireVA_APIMediaSurfacesINTEL_fn)( + cl_command_queue /* command_queue */, + cl_uint /* num_objects */, + const cl_mem* /* mem_objects */, + cl_uint /* num_events_in_wait_list */, + const cl_event* /* event_wait_list */, + cl_event* /* event */) CL_EXT_SUFFIX__VERSION_1_2; + +extern CL_API_ENTRY cl_int CL_API_CALL +clEnqueueReleaseVA_APIMediaSurfacesINTEL( + cl_command_queue /* command_queue */, + cl_uint /* num_objects */, + const cl_mem* /* mem_objects */, + cl_uint /* num_events_in_wait_list */, + const cl_event* /* event_wait_list */, + cl_event* /* event */) CL_EXT_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseVA_APIMediaSurfacesINTEL_fn)( + cl_command_queue /* command_queue */, + cl_uint /* num_objects */, + const cl_mem* /* mem_objects */, + cl_uint /* num_events_in_wait_list */, + const cl_event* /* event_wait_list */, + cl_event* /* event */) CL_EXT_SUFFIX__VERSION_1_2; + +#ifdef __cplusplus +} +#endif + +#endif /* __OPENCL_CL_VA_API_MEDIA_SHARING_INTEL_H */ +

1 0