From cb1323a95c7d3275677760efd96a3eb9824c8aa8 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 12 Nov 2018 02:29:48 +0000 Subject: Mon Nov 12 02:29:48 UTC 2018 a/quota-4.04-x86_64-2.txz: Rebuilt. Fixed high CPU usage. Thanks to allend. ap/nano-3.2-x86_64-1.txz: Upgraded. x/libXcm-0.5.4-x86_64-1.txz: Upgraded. x/xcm-0.5.4-x86_64-1.txz: Upgraded. --- source/x/libXcm/libXcm.SlackBuild | 108 +++++++++++++++++++++++++++++++++++++ source/x/libXcm/libXcm.url | 1 + source/x/libXcm/slack-desc | 19 +++++++ source/x/x11/build/libXcm | 1 - source/x/x11/build/xcm | 1 - source/x/x11/modularize | 2 - source/x/x11/slack-desc/libXcm | 19 ------- source/x/x11/slack-desc/xcm | 19 ------- source/x/xcm/slack-desc | 19 +++++++ source/x/xcm/xcm.SlackBuild | 110 ++++++++++++++++++++++++++++++++++++++ source/x/xcm/xcm.udev.rules.diff | 17 ++++++ source/x/xcm/xcm.url | 1 + 12 files changed, 275 insertions(+), 42 deletions(-) create mode 100755 source/x/libXcm/libXcm.SlackBuild create mode 100644 source/x/libXcm/libXcm.url create mode 100644 source/x/libXcm/slack-desc delete mode 100644 source/x/x11/build/libXcm delete mode 100644 source/x/x11/build/xcm delete mode 100644 source/x/x11/slack-desc/libXcm delete mode 100644 source/x/x11/slack-desc/xcm create mode 100644 source/x/xcm/slack-desc create mode 100755 source/x/xcm/xcm.SlackBuild create mode 100644 source/x/xcm/xcm.udev.rules.diff create mode 100644 source/x/xcm/xcm.url (limited to 'source/x') diff --git a/source/x/libXcm/libXcm.SlackBuild b/source/x/libXcm/libXcm.SlackBuild new file mode 100755 index 000000000..2630f2e68 --- /dev/null +++ b/source/x/libXcm/libXcm.SlackBuild @@ -0,0 +1,108 @@ +#!/bin/bash + +# Slackware build script for libevdev + +# Copyright 2014 Robby Workman, Northport, Alabama, USA +# Copyright 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "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 THE AUTHOR 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 THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=libXcm +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --build=$ARCH-slackware-linux || exit 1 + +make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ + grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a AUTHORS* COPYING* ChangeLog* README* docs/* $PKG/usr/doc/$PKGNAM-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/libXcm/libXcm.url b/source/x/libXcm/libXcm.url new file mode 100644 index 000000000..38e73951d --- /dev/null +++ b/source/x/libXcm/libXcm.url @@ -0,0 +1 @@ +https://github.com/oyranos-cms/libxcm/releases diff --git a/source/x/libXcm/slack-desc b/source/x/libXcm/slack-desc new file mode 100644 index 000000000..7b8edff1e --- /dev/null +++ b/source/x/libXcm/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +libXcm: libXcm (reference implementation of the net-color specification) +libXcm: +libXcm: The libXcm library is a reference implementation of the net-color +libXcm: spec. It allows to attach color regions to X windows to communicate +libXcm: with color servers. +libXcm: +libXcm: +libXcm: +libXcm: +libXcm: +libXcm: diff --git a/source/x/x11/build/libXcm b/source/x/x11/build/libXcm deleted file mode 100644 index 00750edc0..000000000 --- a/source/x/x11/build/libXcm +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/xcm b/source/x/x11/build/xcm deleted file mode 100644 index 00750edc0..000000000 --- a/source/x/x11/build/xcm +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/modularize b/source/x/x11/modularize index 35ae0636d..10d27a5b5 100644 --- a/source/x/x11/modularize +++ b/source/x/x11/modularize @@ -75,7 +75,6 @@ libXScrnSaver libXau libXaw libXaw3d -libXcm libXcomposite libXcursor libXdamage @@ -153,7 +152,6 @@ xcb-util-renderutil xcb-util-wm xclipboard xclock -xcm xcmiscproto xcmsdb xcompmgr diff --git a/source/x/x11/slack-desc/libXcm b/source/x/x11/slack-desc/libXcm deleted file mode 100644 index 7b8edff1e..000000000 --- a/source/x/x11/slack-desc/libXcm +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libXcm: libXcm (reference implementation of the net-color specification) -libXcm: -libXcm: The libXcm library is a reference implementation of the net-color -libXcm: spec. It allows to attach color regions to X windows to communicate -libXcm: with color servers. -libXcm: -libXcm: -libXcm: -libXcm: -libXcm: -libXcm: diff --git a/source/x/x11/slack-desc/xcm b/source/x/x11/slack-desc/xcm deleted file mode 100644 index d7ba58362..000000000 --- a/source/x/x11/slack-desc/xcm +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xcm: xcm (X color management tools) -xcm: -xcm: Tools based on libXcm, a library for colour management on X. -xcm: xcmddc requests EDID from a monitor over the i2c bus. -xcm: xcmedid is for parsing EDID data blocks. -xcm: xcmevents observes X11 colour management events. -xcm: -xcm: -xcm: -xcm: -xcm: diff --git a/source/x/xcm/slack-desc b/source/x/xcm/slack-desc new file mode 100644 index 000000000..517b6a451 --- /dev/null +++ b/source/x/xcm/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xcm: xcm (X color management tools) +xcm: +xcm: Tools based on libXcm, a library for color management on X. +xcm: xcmddc requests EDID from a monitor over the i2c bus. +xcm: xcmedid is for parsing EDID data blocks. +xcm: xcmevents observes X11 color management events. +xcm: +xcm: +xcm: +xcm: +xcm: diff --git a/source/x/xcm/xcm.SlackBuild b/source/x/xcm/xcm.SlackBuild new file mode 100755 index 000000000..472e5b285 --- /dev/null +++ b/source/x/xcm/xcm.SlackBuild @@ -0,0 +1,110 @@ +#!/bin/bash + +# Slackware build script for libevdev + +# Copyright 2014 Robby Workman, Northport, Alabama, USA +# Copyright 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "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 THE AUTHOR 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 THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=xcm +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +zcat $CWD/xcm.udev.rules.diff.gz | patch -p1 --verbose || exit 1 + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --build=$ARCH-slackware-linux || exit 1 + +make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ + grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a AUTHORS* COPYING* ChangeLog* README* docs/* $PKG/usr/doc/$PKGNAM-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/xcm/xcm.udev.rules.diff b/source/x/xcm/xcm.udev.rules.diff new file mode 100644 index 000000000..1a0c1b954 --- /dev/null +++ b/source/x/xcm/xcm.udev.rules.diff @@ -0,0 +1,17 @@ +--- ./scripts/90-xcm-i2c.rules.orig 2016-12-09 15:50:46.000000000 -0600 ++++ ./scripts/90-xcm-i2c.rules 2018-11-11 15:25:36.438669935 -0600 +@@ -1,8 +1,11 @@ + # load the device node kernel module +-SUBSYSTEM=="i2c-adapter", ACTION=="add", RUN+="/sbin/modprobe i2c-dev" ++#SUBSYSTEM=="i2c-adapter", ACTION=="add", RUN+="/sbin/modprobe i2c-dev" + +-# openSUSE_11.3 preferes: +-SUBSYSTEM=="i2c", RUN+="/sbin/modprobe -bv i2c-dev" ++# openSUSE_11.3 prefers: ++#SUBSYSTEM=="i2c", RUN+="/sbin/modprobe -bv i2c-dev" ++ ++# Here's what Slackware uses: ++SUBSYSTEM=="i2c", RUN+="/sbin/modprobe -b i2c-dev" + + # match only DDC devices + KERNEL=="i2c-[0-9]*", ACTION=="add", PROGRAM=="/usr/bin/xcmddc --i2c /dev/%k --identify", RESULT=="0", GROUP="video", MODE="0660" diff --git a/source/x/xcm/xcm.url b/source/x/xcm/xcm.url new file mode 100644 index 000000000..426eb135d --- /dev/null +++ b/source/x/xcm/xcm.url @@ -0,0 +1 @@ +https://github.com/oyranos-cms/xcm/releases -- cgit v1.2.3-79-gdb01