summaryrefslogtreecommitdiff
path: root/libraries/compiz-plugins-main
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/compiz-plugins-main')
-rw-r--r--libraries/compiz-plugins-main/README30
-rw-r--r--libraries/compiz-plugins-main/README.Slackware46
-rw-r--r--libraries/compiz-plugins-main/compiz-plugins-main.SlackBuild52
-rw-r--r--libraries/compiz-plugins-main/compiz-plugins-main.info8
-rw-r--r--libraries/compiz-plugins-main/compiz-plugins-main_animation-plugin-x11-wm.patch128
5 files changed, 98 insertions, 166 deletions
diff --git a/libraries/compiz-plugins-main/README b/libraries/compiz-plugins-main/README
index 103d339757..bd81b036f2 100644
--- a/libraries/compiz-plugins-main/README
+++ b/libraries/compiz-plugins-main/README
@@ -1,15 +1,21 @@
This is the main plugin package for Compiz Fusion.
+PLEASE read the README.Slackware file BEFORE you install any of the
+compiz packages. The install order is listed below but there are
+some important notes you need to be aware of before you install/use
+compiz.
+
For correct installation, build in this order:
- 1. compiz-bcop
- 2. protobuf (optional but recommended)
- 3. libcompizconfig
- 4. compizconfig-python
- 5. compizconfig-backend-kconfig4 (optional)
- 6. ccsm
- 7. compiz-plugins-main
- 8. compiz-plugins-extra (optional)
- 9. compiz-plugins-unsupported (optional)
-10. emerald (optional)
-11. emerald-themes (optional)
-12. fusion-icon (optional)
+ 1. compiz (not available at SBo, see the README.Slackware file)
+ 2. compiz-bcop
+ 3. protobuf (optional but recommended)
+ 4. libcompizconfig
+ 5. compiz (optional, see the README.Slackware file)
+ 6. compizconfig-python
+ 7. ccsm
+ 8. compiz-plugins-main
+ 9. compiz-plugins-extra (optional)
+10. compiz-plugins-experimental (optional)
+11. emerald (optional)
+12. emerald-themes (optional)
+13. fusion-icon (optional)
diff --git a/libraries/compiz-plugins-main/README.Slackware b/libraries/compiz-plugins-main/README.Slackware
new file mode 100644
index 0000000000..d44e53ef41
--- /dev/null
+++ b/libraries/compiz-plugins-main/README.Slackware
@@ -0,0 +1,46 @@
+1) Slackware still ships the old 0.8.8 release of compiz that was
+ released back in 2011. The project has recently been picked up
+ and is being actively maintained by the compiz-reloaded team.
+ You can still use the 0.8.8 version of the compiz that ships
+ with Slackware with the companion packages since there has not been
+ any ABI changes to the code. But there is a good chance you will run
+ into stabilty issues if you do, so it is HIGHLY recommended you use
+ the version of compiz that matches the companion packages. Because
+ you will be replacing a stock Slackware package the SlackBuild is
+ not hosted at www.slackbuilds.org. You can download the SlackBuild
+ from the link below.
+
+ https://dl.dropboxusercontent.com/u/85079539/compiz-0.8.12.3-SlackBuild.tar.gz
+
+ This SlackBuild is based off the 14.2 stock Slackware SlackBuild so you
+ shouldn't run into any problems. If you do use this version of compiz you
+ will need to blacklist compiz in your /etc/slackpkg/blacklist file to keep
+ slackpkg from reverting the package back to 0.8.8
+
+2) Compiz now has basic support for the MATE desktop. You will have to install
+ MATE before you install compiz for support. The MATE slackware project
+ website is located here https://mateslackbuilds.github.io/
+
+3) The compizconfig-backend-kconfig4 package has been removed from the
+ project so if you are upgrading from a previous version you will want
+ to remove this package. Also compiz-plugins-unsupported has now been
+ renamed to compiz-plugins-experimental so you will need to remove
+ compiz-plugins-unsupported before you upgrade to the newest packages.
+
+4) The install order has compiz listed twice. libcompizconfig depends
+ on compiz, but compiz has some extra window decorator related features
+ that depend on libcompizconfig. So if you want these extra features you
+ will have to recompile compiz again AFTER you build and install
+ libcompizconfig. This is not required it is just an option if you want
+ to do it.
+
+5) After you install compiz and the companion packages you will need to
+ launch CCSM and enable "Move", "Resize Window", and "Window Decorations"
+ before you start compiz. This way you can manage your windows. After
+ you enable those three options you can start compiz and customize to
+ your liking.
+
+
+
+
+
diff --git a/libraries/compiz-plugins-main/compiz-plugins-main.SlackBuild b/libraries/compiz-plugins-main/compiz-plugins-main.SlackBuild
index 489ed9b206..f1a10576fb 100644
--- a/libraries/compiz-plugins-main/compiz-plugins-main.SlackBuild
+++ b/libraries/compiz-plugins-main/compiz-plugins-main.SlackBuild
@@ -2,17 +2,36 @@
# Slackware build script for compiz-plugins-main
-# Written by M.Dinslage (daedra1980@gmail.com)
+# Copyright 2016 Matt Dinslage, Springfield, MO
+# 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.
PRGNAM=compiz-plugins-main
-VERSION=${VERSION:-0.8.10}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.8.12.2}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@@ -24,16 +43,16 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- SLKLDFLAGS=""; LIBDIRSUFFIX=""
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- SLKLDFLAGS=""; LIBDIRSUFFIX=""
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
- SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
+ LIBDIRSUFFIX="64"
else
SLKCFLAGS="-O2"
- SLKLDFLAGS=""; LIBDIRSUFFIX=""
+ LIBDIRSUFFIX=""
fi
set -e
@@ -41,9 +60,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf plugins-main
-tar xvf $CWD/plugins-main.tar.gz
-cd plugins-main
+rm -rf $PRGNAM-$VERSION
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -51,19 +70,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Fix crashing when animation plugin in used.
-# Thanks to the fedora project for this patch
-patch -p1 < $CWD/compiz-plugins-main_animation-plugin-x11-wm.patch
-
-./autogen.sh
-# Fix hardcoded checks for pango and cairo
-if [ "$ARCH" = "x86_64" ]; then
- sed -i 's,/lib/pkgconfig,/lib64/pkgconfig,g' configure
-fi
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="$SLKLDFLAGS" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -80,7 +88,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS VERSION $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING INSTALL NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/libraries/compiz-plugins-main/compiz-plugins-main.info b/libraries/compiz-plugins-main/compiz-plugins-main.info
index 657ab79c56..82c9c7fc19 100644
--- a/libraries/compiz-plugins-main/compiz-plugins-main.info
+++ b/libraries/compiz-plugins-main/compiz-plugins-main.info
@@ -1,8 +1,8 @@
PRGNAM="compiz-plugins-main"
-VERSION="0.8.10"
-HOMEPAGE="http://www.compiz.org"
-DOWNLOAD="http://www.northfield.ws/projects/compiz/releases/0.8.10/plugins-main.tar.gz"
-MD5SUM="638bafc171d06c27d8d70ea75ba61196"
+VERSION="0.8.12.2"
+HOMEPAGE="https://github.com/raveit65/compiz-plugins-main"
+DOWNLOAD="https://github.com/compiz-reloaded/compiz-plugins-main/releases/download/v0.8.12.2/compiz-plugins-main-0.8.12.2.tar.xz"
+MD5SUM="5b80af2c55a0f072244cbba1a753328a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="ccsm"
diff --git a/libraries/compiz-plugins-main/compiz-plugins-main_animation-plugin-x11-wm.patch b/libraries/compiz-plugins-main/compiz-plugins-main_animation-plugin-x11-wm.patch
deleted file mode 100644
index 5dff418dc9..0000000000
--- a/libraries/compiz-plugins-main/compiz-plugins-main_animation-plugin-x11-wm.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -upr compiz-plugins-main-0.8.8-orig/include/compiz-animation.h compiz-plugins-main-0.8.8/include/compiz-animation.h
---- compiz-plugins-main-0.8.8-orig/include/compiz-animation.h 2011-04-21 12:20:09.000000000 +0200
-+++ compiz-plugins-main-0.8.8/include/compiz-animation.h 2015-05-13 11:31:11.970670459 +0200
-@@ -215,7 +215,7 @@ typedef struct _AnimBaseFunctions {
-
- #define OPTION_GETTERS(extensionBaseFunctions, \
- extensionPluginInfo, firstEffectOption) \
--static inline CompOptionValue * \
-+extern inline CompOptionValue * \
- animGetOptVal (CompWindow *w, \
- int optionId) \
- { \
-@@ -223,35 +223,35 @@ animGetOptVal (CompWindow *w, \
- (w, (extensionPluginInfo), optionId - (firstEffectOption)); \
- } \
- \
--inline Bool \
-+extern inline Bool \
- animGetB (CompWindow *w, \
- int optionId) \
- { \
- return animGetOptVal (w, optionId)->b; \
- } \
- \
--inline int \
-+extern inline int \
- animGetI (CompWindow *w, \
- int optionId) \
- { \
- return animGetOptVal (w, optionId)->i; \
- } \
- \
--inline float \
-+extern inline float \
- animGetF (CompWindow *w, \
- int optionId) \
- { \
- return animGetOptVal (w, optionId)->f; \
- } \
- \
--inline char * \
-+extern inline char * \
- animGetS (CompWindow *w, \
- int optionId) \
- { \
- return animGetOptVal (w, optionId)->s; \
- } \
- \
--inline unsigned short * \
-+extern inline unsigned short * \
- animGetC (CompWindow *w, \
- int optionId) \
- { \
-@@ -260,23 +260,23 @@ animGetC (CompWindow *w, \
-
- #define OPTION_GETTERS_HDR \
- \
--inline Bool \
-+extern inline Bool \
- animGetB (CompWindow *w, \
- int optionId); \
- \
--inline int \
-+extern inline int \
- animGetI (CompWindow *w, \
- int optionId); \
- \
--inline float \
-+extern inline float \
- animGetF (CompWindow *w, \
- int optionId); \
- \
--inline char * \
-+extern inline char * \
- animGetS (CompWindow *w, \
- int optionId); \
- \
--inline unsigned short * \
-+extern inline unsigned short * \
- animGetC (CompWindow *w, \
- int optionId);
-
-diff -upr compiz-plugins-main-0.8.8-orig/src/animation/animation.c compiz-plugins-main-0.8.8/src/animation/animation.c
---- compiz-plugins-main-0.8.8-orig/src/animation/animation.c 2011-04-21 12:20:09.000000000 +0200
-+++ compiz-plugins-main-0.8.8/src/animation/animation.c 2015-05-13 11:34:57.181935016 +0200
-@@ -742,7 +742,7 @@ defaultUpdateWindowTransform (CompWindow
- }
-
- // Apply transform to wTransform
--inline void
-+extern inline void
- applyTransform (CompTransform *wTransform,
- CompTransform *transform)
- {
-diff -upr compiz-plugins-main-0.8.8-orig/src/animation/animation-internal.h compiz-plugins-main-0.8.8/src/animation/animation-nternal.h
---- compiz-plugins-main-0.8.8-orig/src/animation/animation-internal.h 2011-04-21 12:20:09.000000000 +0200
-+++ compiz-plugins-main-0.8.8/src/animation/animation-internal.h 2015-05-13 11:34:06.853428950 +0200
-@@ -429,7 +429,7 @@ applyPerspectiveSkew (CompOutput *output
- CompTransform *transform,
- Point *center);
-
--inline void
-+extern inline void
- applyTransform (CompTransform *wTransform,
- CompTransform *transform);
-
-@@ -616,7 +616,7 @@ fxZoomInit (CompWindow * w);
- void
- applyZoomTransform (CompWindow * w);
-
--void
-+extern inline void
- getZoomCenterScale (CompWindow *w,
- Point *pCurCenter, Point *pCurScale);
-
-diff -upr compiz-plugins-main-0.8.8-orig/src/animation/zoomside.c compiz-plugins-main-0.8.8/src/animation/zoomside.c
---- compiz-plugins-main-0.8.8-orig/src/animation/zoomside.c 2011-04-21 12:20:09.000000000 +0200
-+++ compiz-plugins-main-0.8.8/src/animation/zoomside.c 2015-05-13 11:36:15.021717714 +0200
-@@ -303,7 +303,7 @@ getZoomCenterScaleFull (CompWindow *w,
- *pRotateProgress = rotateProgress;
- }
-
--inline void
-+extern inline void
- getZoomCenterScale (CompWindow *w,
- Point *pCurCenter, Point *pCurScale)
- {
-