libcompizconfig: Changes to 'upstream-unstable'
Rebased ref, commits from common ancestor:
commit 78a7cc8ca71020dff42dd2731071bfdf548ea2e8
Author: Sam Spilsbury <sam.spilsbury@canonical.com>
Date: Thu Nov 25 18:22:33 2010 +0800
Revert "Add a COMPIZCONFIG_PROFILE env var so that distributions and"
This reverts commit e1438fb552487271ebed9894516c74210eb3de81.
No need for it, we have COMPIZ_CONFIG_PROFILE
diff --git a/cmake/LibCompizConfigCommon.cmake b/cmake/LibCompizConfigCommon.cmake
index a5e154e..de27b71 100644
--- a/cmake/LibCompizConfigCommon.cmake
+++ b/cmake/LibCompizConfigCommon.cmake
@@ -5,7 +5,7 @@ include (CompizPackage)
macro (_get_backend_parameters _prefix)
set (_current_var _foo)
- set (_supported_var PKGDEPS LDFLAGSADD CFLAGSADD LIBRARIES LIBDIRS INCDIRS FILESADD)
+ set (_supported_var PKGDEPS LDFLAGSADD CFLAGSADD LIBRARIES LIBDIRS INCDIRS)
foreach (_val ${_supported_var})
set (${_prefix}_${_val})
endforeach (_val)
@@ -87,8 +87,7 @@ function (compizconfig_backend bname)
add_library (
${bname} SHARED ${_cpp_files}
${_h_files}
- ${_c_files}
- ${compizconfig_${_BACKEND}_FILESADD})
+ ${_c_files})
target_link_libraries (
${bname}
diff --git a/src/main.c b/src/main.c
index e052885..4d861f6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -59,13 +59,7 @@ initGeneralOptions (CCSContext * context)
else
ccsSetBackend (context, "ini");
- /* The session might ask for a specific profile */
-
- if ((val = getenv ("COMPIZCONFIG_PROFILE")))
- {
- ccsSetProfile (context, val);
- }
- else if (ccsReadConfig (OptionProfile, &val))
+ if (ccsReadConfig (OptionProfile, &val))
{
ccsSetProfile (context, val);
free (val);
@@ -566,7 +560,7 @@ openBackend (char *backend)
if (home && strlen (home))
{
- asprintf (&dlname, "%s/.compizconfig/backends/lib%s.so",
+ asprintf (&dlname, "%s/.compizconfig/backends/lib%s.so",
home, backend);
dlerror ();
dlhand = dlopen (dlname, RTLD_NOW | RTLD_NODELETE | RTLD_LOCAL);
@@ -578,7 +572,7 @@ openBackend (char *backend)
if (dlname) {
free (dlname);
}
- asprintf (&dlname, "%s/compizconfig/backends/lib%s.so",
+ asprintf (&dlname, "%s/compizconfig/backends/lib%s.so",
LIBDIR, backend);
dlhand = dlopen (dlname, RTLD_NOW | RTLD_NODELETE | RTLD_LOCAL);
err = dlerror ();
@@ -1536,7 +1530,7 @@ ccsGetSortedPluginStringList (CCSContext * context)
found = TRUE;
l2 = l2->next;
}
-
+
if (p && !ccsPluginListFind (plugins[i].after, p) && !found)
plugins[i].after = ccsPluginListAppend (plugins[i].after, p);
@@ -1774,9 +1768,9 @@ ccsReadSettings (CCSContext * context)
{
if (!context)
return;
-
+
CONTEXT_PRIV (context);
-
+
if (!cPrivate->backend)
return;
@@ -1842,7 +1836,7 @@ ccsWriteSettings (CCSContext * context)
{
if (!context)
return;
-
+
CONTEXT_PRIV (context);
if (!cPrivate->backend)
@@ -1882,9 +1876,9 @@ ccsWriteChangedSettings (CCSContext * context)
{
if (!context)
return;
-
+
CONTEXT_PRIV (context);
-
+
if (!cPrivate->backend)
return;
@@ -2263,7 +2257,7 @@ ccsCanDisablePlugin (CCSContext * context, CCSPlugin * plugin)
}
pluginList = pluginList->next;
}
-
+
}
if (conflict)
list = ccsPluginConflictListAppend (list, conflict);
@@ -2279,9 +2273,9 @@ ccsGetExistingProfiles (CCSContext * context)
{
if (!context)
return NULL;
-
+
CONTEXT_PRIV (context);
-
+
if (!cPrivate->backend)
return NULL;
@@ -2296,9 +2290,9 @@ ccsDeleteProfile (CCSContext * context, char *name)
{
if (!context)
return;
-
+
CONTEXT_PRIV (context);
-
+
if (!cPrivate->backend)
return;
@@ -2473,7 +2467,7 @@ ccsExportToFile (CCSContext *context,
if (skipDefaults && setting->isDefault)
continue;
- asprintf (&keyName, "s%d_%s",
+ asprintf (&keyName, "s%d_%s",
context->screenNum, setting->name);
switch (setting->type)
@@ -2573,7 +2567,7 @@ ccsImportFromFile (CCSContext *context,
if (!setting->isDefault && !overwriteNonDefault)
continue;
- asprintf (&keyName, "s%d_%s",
+ asprintf (&keyName, "s%d_%s",
context->screenNum, setting->name);
switch (setting->type)
commit f7355bf03c3611e9349661c6cad2865a83d1b134
Author: Sam Spilsbury <sam.spilsbury@canonical.com>
Date: Thu Nov 25 18:07:13 2010 +0800
Ensure that we install the config defaults in SYSCONFDIR and also add a custom target for it
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a57a81..8f9e686 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,7 +132,7 @@ install (
)
-
+add_subdirectory (config)
add_subdirectory (backend)
add_subdirectory (plugin)
add_subdirectory (src)
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
new file mode 100644
index 0000000..728db4a
--- /dev/null
+++ b/config/CMakeLists.txt
@@ -0,0 +1,10 @@
+set (_config_file
+ config)
+
+compiz_opt_install_file (${_config_file} ${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file})
+
+add_custom_target (
+ config_install
+ ${CMAKE_COMMAND} -E make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
+ ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/config/${_config_file} ${COMPIZ_DESTDIR}${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file}
+ )
commit e1438fb552487271ebed9894516c74210eb3de81
Author: Sam Spilsbury <sam.spilsbury@canonical.com>
Date: Mon Nov 22 18:58:50 2010 +0800
Add a COMPIZCONFIG_PROFILE env var so that distributions and
session managers can specify per-session profiles
diff --git a/cmake/LibCompizConfigCommon.cmake b/cmake/LibCompizConfigCommon.cmake
index de27b71..a5e154e 100644
--- a/cmake/LibCompizConfigCommon.cmake
+++ b/cmake/LibCompizConfigCommon.cmake
@@ -5,7 +5,7 @@ include (CompizPackage)
macro (_get_backend_parameters _prefix)
set (_current_var _foo)
- set (_supported_var PKGDEPS LDFLAGSADD CFLAGSADD LIBRARIES LIBDIRS INCDIRS)
+ set (_supported_var PKGDEPS LDFLAGSADD CFLAGSADD LIBRARIES LIBDIRS INCDIRS FILESADD)
foreach (_val ${_supported_var})
set (${_prefix}_${_val})
endforeach (_val)
@@ -87,7 +87,8 @@ function (compizconfig_backend bname)
add_library (
${bname} SHARED ${_cpp_files}
${_h_files}
- ${_c_files})
+ ${_c_files}
+ ${compizconfig_${_BACKEND}_FILESADD})
target_link_libraries (
${bname}
diff --git a/src/main.c b/src/main.c
index 4d861f6..e052885 100644
--- a/src/main.c
+++ b/src/main.c
@@ -59,7 +59,13 @@ initGeneralOptions (CCSContext * context)
else
ccsSetBackend (context, "ini");
- if (ccsReadConfig (OptionProfile, &val))
+ /* The session might ask for a specific profile */
+
+ if ((val = getenv ("COMPIZCONFIG_PROFILE")))
+ {
+ ccsSetProfile (context, val);
+ }
+ else if (ccsReadConfig (OptionProfile, &val))
{
ccsSetProfile (context, val);
free (val);
@@ -560,7 +566,7 @@ openBackend (char *backend)
if (home && strlen (home))
{
- asprintf (&dlname, "%s/.compizconfig/backends/lib%s.so",
+ asprintf (&dlname, "%s/.compizconfig/backends/lib%s.so",
home, backend);
dlerror ();
dlhand = dlopen (dlname, RTLD_NOW | RTLD_NODELETE | RTLD_LOCAL);
@@ -572,7 +578,7 @@ openBackend (char *backend)
if (dlname) {
free (dlname);
}
- asprintf (&dlname, "%s/compizconfig/backends/lib%s.so",
+ asprintf (&dlname, "%s/compizconfig/backends/lib%s.so",
LIBDIR, backend);
dlhand = dlopen (dlname, RTLD_NOW | RTLD_NODELETE | RTLD_LOCAL);
err = dlerror ();
@@ -1530,7 +1536,7 @@ ccsGetSortedPluginStringList (CCSContext * context)
found = TRUE;
l2 = l2->next;
}
-
+
if (p && !ccsPluginListFind (plugins[i].after, p) && !found)
plugins[i].after = ccsPluginListAppend (plugins[i].after, p);
@@ -1768,9 +1774,9 @@ ccsReadSettings (CCSContext * context)
{
if (!context)
return;
-
+
CONTEXT_PRIV (context);
-
+
if (!cPrivate->backend)
return;
@@ -1836,7 +1842,7 @@ ccsWriteSettings (CCSContext * context)
{
if (!context)
return;
-
+
CONTEXT_PRIV (context);
if (!cPrivate->backend)
@@ -1876,9 +1882,9 @@ ccsWriteChangedSettings (CCSContext * context)
{
if (!context)
return;
-
+
CONTEXT_PRIV (context);
-
+
if (!cPrivate->backend)
return;
@@ -2257,7 +2263,7 @@ ccsCanDisablePlugin (CCSContext * context, CCSPlugin * plugin)
}
pluginList = pluginList->next;
}
-
+
}
if (conflict)
list = ccsPluginConflictListAppend (list, conflict);
@@ -2273,9 +2279,9 @@ ccsGetExistingProfiles (CCSContext * context)
{
if (!context)
return NULL;
-
+
CONTEXT_PRIV (context);
-
+
if (!cPrivate->backend)
return NULL;
@@ -2290,9 +2296,9 @@ ccsDeleteProfile (CCSContext * context, char *name)
{
if (!context)
return;
-
+
CONTEXT_PRIV (context);
-
+
if (!cPrivate->backend)
return;
@@ -2467,7 +2473,7 @@ ccsExportToFile (CCSContext *context,
if (skipDefaults && setting->isDefault)
continue;
- asprintf (&keyName, "s%d_%s",
+ asprintf (&keyName, "s%d_%s",
context->screenNum, setting->name);
switch (setting->type)
@@ -2567,7 +2573,7 @@ ccsImportFromFile (CCSContext *context,
if (!setting->isDefault && !overwriteNonDefault)
continue;
- asprintf (&keyName, "s%d_%s",
+ asprintf (&keyName, "s%d_%s",
context->screenNum, setting->name);
switch (setting->type)
commit 9405fc95eb64147be29bd355575b013f104631bd
Author: Didier Roche <didrocks@ubuntu.com>
Date: Thu Nov 18 13:57:40 2010 +0100
Give a default value to COMPIZ_SYSCONFDIR
That enables SYSCONFDIR to get one and so, reading the Global configuration
file.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 904cc3d..6a57a81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,8 @@ else (COMPIZ_PACKAGING_ENABLED)
set (exec_prefix ${CMAKE_INSTALL_PREFIX}/bin)
endif (COMPIZ_PACKAGING_ENABLED)
+set (COMPIZ_SYSCONFDIR "/etc" CACHE PATH "/etc")
+
option (USE_PROTOBUF
"Use Google Protocol Buffers library for faster XML loading"
ON
commit 0d25d2e9a2aaacacf5a6efe75f995fb1e51bea9c
Author: Sam Spilsbury <smspillaz@gmail.com>
Date: Sat Nov 6 20:48:34 2010 +0800
Update NEWS for 0.9.2.1 Release
diff --git a/NEWS b/NEWS
index 97466cf..1846b6c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,3 @@
-Release 0.9.2 (2010-11-06 Sam Spilsbury <sam.spilsbury@canonical.com>)
-=====================================================================
-Bugfix release.
-
Release 0.9.0 (2010-07-03 Sam Spilsbury <smspillaz@gmail.com>)
==============================================================
Development release.
@@ -15,3 +11,7 @@ Release 0.9.2 (2010-10-24 Sam Spilsbury <smspillaz@gmail.com>)
Development release.
Fixed symbol linking issue with backends
+
+Release 0.9.2.1 (2010-11-06 Sam Spilsbury <sam.spilsbury@canonical.com>)
+========================================================================
+Bugfix release.
commit 3fb22ea2e7a5a8a58ad5e8585c670fc9a7125aa4
Author: Sam Spilsbury <smspillaz@gmail.com>
Date: Sat Nov 6 20:47:01 2010 +0800
Update NEWS for 0.9.2.1 Release
diff --git a/NEWS b/NEWS
index ee0b25f..97466cf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Release 0.9.2 (2010-11-06 Sam Spilsbury <sam.spilsbury@canonical.com>)
+=====================================================================
+Bugfix release.
+
Release 0.9.0 (2010-07-03 Sam Spilsbury <smspillaz@gmail.com>)
==============================================================
Development release.
commit 5d5926060559813f8e3a228318ed62e3e8c771d5
Author: Sam Spilsbury <smspillaz@gmail.com>
Date: Sat Nov 6 20:35:45 2010 +0800
Add a LIBCOMPIZCONFIG_VERSION_MACRO and update to 0.9.2.1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6997555..904cc3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,9 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
# An even micro number indicates a released version.
set (LIBCOMPIZCONFIG_VERSION_MAJOR 0)
set (LIBCOMPIZCONFIG_VERSION_MINOR 9)
-set (LIBCOMPIZCONFIG_VERSION_MICRO 0)
-set (VERSION ${LIBCOMPIZCONFIG_VERSION_MAJOR}.${LIBCOMPIZCONFIG_VERSION_MINOR}.${LIBCOMPIZCONFIG_VERSION_MICRO})
+set (LIBCOMPIZCONFIG_VERSION_MICRO 2)
+set (LIBCOMPIZCONFIG_VERSION_MACRO 1)
+set (VERSION ${LIBCOMPIZCONFIG_VERSION_MAJOR}.${LIBCOMPIZCONFIG_VERSION_MINOR}.${LIBCOMPIZCONFIG_VERSION_MICRO}.${LIBCOMPIZCONFIG_VERSION_MACRO})
set (_libcompizconfig_package_string "LibCompizConfig ${VERSION}")
set (_libcompizconfig_package "LibCompizCompiz")
commit 2526029f717644ee856af8a462228fd40ed60424
Author: Sam Spilsbury <smspillaz@gmail.com>
Date: Sun Oct 24 23:38:37 2010 +0800
Fix warnings when protobuf is disabled
diff --git a/src/compiz.cpp b/src/compiz.cpp
index f99f1c6..99cbee6 100644
--- a/src/compiz.cpp
+++ b/src/compiz.cpp
@@ -2694,7 +2694,6 @@ static void
loadPluginFromXMLFile (CCSContext * context, char *xmlName, char *xmlDirPath)
{
char *xmlFilePath = NULL;
- char *pbFilePath = NULL;
void *pluginInfoPBv = NULL;
asprintf (&xmlFilePath, "%s/%s", xmlDirPath, xmlName);
@@ -2706,6 +2705,7 @@ loadPluginFromXMLFile (CCSContext * context, char *xmlName, char *xmlDirPath)
#ifdef USE_PROTOBUF
char *name = NULL;
+ char *pbFilePath = NULL;
struct stat xmlStat;
Bool removePB = FALSE;
@@ -3024,10 +3024,10 @@ void
ccsLoadPluginSettings (CCSPlugin * plugin)
{
Bool ignoreXML = FALSE;
- Bool loadedAtLeastBriefPB = FALSE;
void *pluginPBToWrite = NULL;
#ifdef USE_PROTOBUF
+ Bool loadedAtLeastBriefPB = FALSE;
initPBLoading ();
#endif
commit 0780051028371e006173c5a30ddd1d7930630375
Author: Sam Spilsbury <smspillaz@gmail.com>
Date: Sun Oct 24 22:46:27 2010 +0800
Update NEWS for 0.9.2
diff --git a/NEWS b/NEWS
index 86b9b7d..ee0b25f 100644
--- a/NEWS
+++ b/NEWS
@@ -5,3 +5,9 @@ Development release.
Removed multiscreen support to reflect core API changes.
Added CMake Buildsystem.
+
+Release 0.9.2 (2010-10-24 Sam Spilsbury <smspillaz@gmail.com>)
+==============================================================
+Development release.
+
+Fixed symbol linking issue with backends
commit 6f3254c30435d70712c53e532f491ac35c702a80
Author: Sam Spilsbury <smspillaz@gmail.com>
Date: Wed Sep 29 22:13:57 2010 +0800
Update INSTALL file
diff --git a/INSTALL b/INSTALL
index 23e5f25..16cfcef 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,236 +1,15 @@
-Installation Instructions
-*************************
+libcompizconfig uses out-of-tree builds with cmake, in order to generate the Makefiles for compiz use:
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+ $ mkdir build
+ $ cd build
+ $ cmake ..
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+After that, standard build procedures apply:
-Basic Installation
-==================
+ $ make
+ # make install
-These are generic installation instructions.
+In order to build other backends, you will need to install the compizconfig cmake set
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
-
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
-
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
+ # make findcompizconfig_install
commit ac8600187255dacedc894c2f749159201814dc42
Author: Sam Spilsbury <smspillaz@gmail.com>
Date: Fri Aug 20 06:44:24 2010 +0800
Fix backends not linking against libraries specified in PKGDEPS
diff --git a/cmake/LibCompizConfigCommon.cmake b/cmake/LibCompizConfigCommon.cmake
index e8b8884..de27b71 100644
--- a/cmake/LibCompizConfigCommon.cmake
+++ b/cmake/LibCompizConfigCommon.cmake
@@ -66,6 +66,7 @@ function (compizconfig_backend bname)
)
link_directories (
+ ${compizconfig_${_BACKEND}_PKG_LIBDIRS}
${COMPIZCONFIG_LIBRARY_DIRS}
)
@@ -91,9 +92,9 @@ function (compizconfig_backend bname)
target_link_libraries (
${bname}
compizconfig
- ${${_BACKEND}_LOCAL_LIBRARIES}
- ${${_BACKEND}_PKG_LIBRARIES}
- ${${_BACKEND}_LIBRARIES}
+ ${compizconfig_${_BACKEND}_LOCAL_LIBRARIES}
+ ${compizconfig_${_BACKEND}_PKG_LIBRARIES}
+ ${compizconfig_${_BACKEND}_LIBRARIES}
)
if (COMPIZ_BUILD_WITH_RPATH)
commit 3c91075c5cf6db62ab443ee4d1a2c593f6b001d2
Author: Sam Spilsbury <smspillaz@gmail.com>
Date: Sun Jul 4 09:13:30 2010 +0800
Update NEWS for 0.9.0 release
diff --git a/NEWS b/NEWS
index 94941cc..86b9b7d 100644
--- a/NEWS
+++ b/NEWS
@@ -1 +1,7 @@
-There is nothing here yet.
+Release 0.9.0 (2010-07-03 Sam Spilsbury <smspillaz@gmail.com>)
+==============================================================
+Development release.
+
+Removed multiscreen support to reflect core API changes.
+
+Added CMake Buildsystem.
commit 9794cf1b8d722dd20057c136b97f37478b40247f
Author: Sam Spilsbury <smspillaz@gmail.com>
Date: Sun Jul 4 07:35:37 2010 +0800
Bump version
diff --git a/VERSION b/VERSION
index 1357b31..f626ec2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.9
+VERSION=0.9.0
commit ef2a5ebfc39138225d81bbf96f3f2c8c493419b3
Author: Sam Spilsbury <smspillaz@gmail.com>
Date: Sun Jul 4 10:28:44 2010 +0800
Load files from .compiz-1
diff --git a/src/compiz.cpp b/src/compiz.cpp
index 7e0dd3e..f99f1c6 100644
--- a/src/compiz.cpp
+++ b/src/compiz.cpp
@@ -2937,7 +2937,7 @@ ccsLoadPlugin (CCSContext * context, char *name)
char *home = getenv ("HOME");
if (home && strlen (home))
{
- asprintf (&xmlDirPath, "%s/.compiz/metadata", home);
+ asprintf (&xmlDirPath, "%s/.compiz-1/metadata", home);
if (xmlDirPath)
{
loadPluginFromXMLFile (context, xmlName, xmlDirPath);
@@ -2965,7 +2965,7 @@ ccsLoadPlugins (CCSContext * context)
if (home && strlen (home))
{
char *homeplugins = NULL;
- asprintf (&homeplugins, "%s/.compiz/metadata", home);
+ asprintf (&homeplugins, "%s/.compiz-1/metadata", home);
if (homeplugins)
{
loadPluginsFromXMLFiles (context, homeplugins);
@@ -2977,7 +2977,7 @@ ccsLoadPlugins (CCSContext * context)
if (home && strlen (home))
{
char *homeplugins = NULL;
- asprintf (&homeplugins, "%s/.compiz/plugins", home);
+ asprintf (&homeplugins, "%s/.compiz-1/plugins", home);
if (homeplugins)
{
loadPluginsFromName (context, homeplugins);
commit 37a48b5773b16eec182b64a83d126a6a10287f45
Author: Sam Spilsbury <smspillaz@gmail.com>
Date: Sun Jul 4 10:13:18 2010 +0800
Save protobuf files in XDG_CACHE_DIR/compizconfig-1 to prevent conflicts where 0.8 protobuf files might be loaded into 0.9 and vice versa
diff --git a/src/compiz.cpp b/src/compiz.cpp
index 76f8758..7e0dd3e 100644
--- a/src/compiz.cpp
+++ b/src/compiz.cpp
@@ -1894,7 +1894,7 @@ createProtoBufCacheDir ()
metadataCacheDir = cacheBaseDir;
if (metadataCacheDir[metadataCacheDir.length () - 1] != '/')
metadataCacheDir += "/";
- metadataCacheDir += "compizconfig";
+ metadataCacheDir += "compizconfig-1";
std::string metadataCacheFileDummy = metadataCacheDir + "/dummy";
// Create cache dir
commit f9e67651a64b05196c48b12d51e296144550f57b
Author: Sam Spilsbury <smspillaz@gmail.com>
Date: Fri Jun 18 23:39:30 2010 +0800
Add a COMPIZ_PACKAGING_ENABLED option for packagers to tweak libdir, et.
Allowing this by default causes some distros to populate these options with /usr, etc
and overrides CMAKE_INSTALL_PREFIX, which users wouldn't want
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a74f958..6997555 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,11 +32,17 @@ include_directories (
"include"
)
-
-set (libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "libdir")
-set (includedir ${CMAKE_INSTALL_PREFIX}/include/compizconfig CACHE PATH "includedir")
-set (prefix ${CMAKE_INSTALL_PREFIX} CACHE PATH "prefix")
-set (exec_prefix ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "bindir")
+if (COMPIZ_PACKAGING_ENABLED)
+ set (libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "libdir")
+ set (includedir ${CMAKE_INSTALL_PREFIX}/include/compizconfig CACHE PATH "includedir")
+ set (prefix ${CMAKE_INSTALL_PREFIX} CACHE PATH "prefix")
+ set (exec_prefix ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "bindir")
+else (COMPIZ_PACKAGING_ENABLED)
+ set (libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ set (includedir ${CMAKE_INSTALL_PREFIX}/include/compizconfig)
+ set (prefix ${CMAKE_INSTALL_PREFIX})
+ set (exec_prefix ${CMAKE_INSTALL_PREFIX}/bin)
+endif (COMPIZ_PACKAGING_ENABLED)
option (USE_PROTOBUF
"Use Google Protocol Buffers library for faster XML loading"
commit 86635829563f56021bcc69fbdc7a765ae709711d
Author: Dominique Leuenberger <dominique@leuenberger.net>
Date: Tue Jun 1 20:36:07 2010 +0200
Better control of destination folders by introducing the same variables as in core
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8778c5..a74f958 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,10 +33,10 @@ include_directories (
)
-set (libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
-set (includedir ${CMAKE_INSTALL_PREFIX}/include/compizconfig)
-set (prefix ${CMAKE_INSTALL_PREFIX})
-set (exec_prefix ${CMAKE_INSTALL_PREFIX})
+set (libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "libdir")
+set (includedir ${CMAKE_INSTALL_PREFIX}/include/compizconfig CACHE PATH "includedir")
+set (prefix ${CMAKE_INSTALL_PREFIX} CACHE PATH "prefix")
+set (exec_prefix ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "bindir")
option (USE_PROTOBUF
"Use Google Protocol Buffers library for faster XML loading"
commit 60705253fecb4cde30ea7bddc98624f28870922b
Author: Sam Spilsbury <SmSpillaz@gmail.com>
Date: Sun Jun 6 14:18:33 2010 +0800
Don't install FindCompizConfig.cmake to ${prefix}/share/compiz/cmake
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 0725dfc..bfe3ebc 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -1,5 +1,4 @@
set (_files
- FindCompizConfig.cmake
LibCompizConfigCommon.cmake
)
commit f1e2827b9f6292c3c0db6f46468752d1f8cdb62a
Author: Sam Spilsbury <SmSpillaz@gmail.com>
Date: Sun Jun 6 10:56:19 2010 +0800
Fix backends build
diff --git a/cmake/LibCompizConfigCommon.cmake b/cmake/LibCompizConfigCommon.cmake
index 484475f..e8b8884 100644
--- a/cmake/LibCompizConfigCommon.cmake
+++ b/cmake/LibCompizConfigCommon.cmake
@@ -52,16 +52,17 @@ function (compizconfig_backend bname)
project (compizconfig_${_BACKEND})
_get_backend_parameters (compizconfig_${_BACKEND} ${ARGN})
- _check_backend_pkg_deps (compizconfig_${_BACKEND} ${${_BACKEND}_PKGDEPS})
+ _check_backend_pkg_deps (compizconfig_${_BACKEND} ${compizconfig_${_BACKEND}_PKGDEPS})
include_directories (
${CMAKE_SOURCE_DIR}/include
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${BACKEND_INCLUDE_DIRS}
- ${${_BACKEND}_LOCAL_INCDIRS}
- ${${_BACKEND}_PKG_INCDIRS}
- ${${_BACKEND}_INCDIRS}
Reply to: