Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Andraž 'ruskie' Levstik (d71d5dba77af582de55bea58a8f0a645bb3f90af)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andraž 'ruskie' Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Andraž 'ruskie' Levstik (d71d5dba77af582de55bea58a8f0a645bb3f90af)
  • Date: Fri, 11 Apr 2008 14:16:58 -0500

GIT changes to master grimoire by Andraž 'ruskie' Levstik
<ruskie AT codemages.net>:

ChangeLog | 4 ++--
x11-libs/pixman/DEPENDS | 1 -
x11-libs/pixman/DETAILS | 13 -------------
x11-libs/pixman/HISTORY | 10 ----------
x11-libs/pixman/INSTALL | 11 -----------
xorg-lib/pixman/CONFLICTS | 1 +
xorg-lib/pixman/DETAILS | 14 ++++++++++++++
xorg-lib/pixman/HISTORY | 35 +++++++++++++++++++++++++++++++++++
xorg-lib/pixman/INSTALL | 12 ++++++++++++
9 files changed, 64 insertions(+), 37 deletions(-)

New commits:
commit d71d5dba77af582de55bea58a8f0a645bb3f90af
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

"pixman-0.10.0"

commit f7b2875090a5bb3b40abf476c40085e10bd81d1b
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

pixman: removed X providers

commit 83184e981808ca38bc8d88382d9ee768c09a2798
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

Merge branch 'devel-xorg-modular' of
ssh://scm.sourcemage.org/smgl/grimoire into xorg-modular

Conflicts:

xorg-app/compiz/HISTORY
xorg-app/luit/HISTORY
xorg-data/xkbdata/CONFLICTS
xorg-data/xkbdata/HISTORY
xorg-driver/xf86-input-acecad/HISTORY
xorg-driver/xf86-video-ati/HISTORY
xorg-driver/xf86-video-intel/HISTORY
xorg-driver/xf86-video-mga/HISTORY
xorg-driver/xf86-video-trident/HISTORY
xorg-lib/pixman/CONFLICTS
xorg-lib/pixman/HISTORY

commit 37d9f16dd7310c910b74f18f4e865027e5838035
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

pixman: Auto-conflicts with xorg as well

commit f14e3b8cf7b69fa6b830dcc053317c983652ac88
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

pixman: Auto-conflicts with all prior monolithic X providers

commit 3fe3ce33641fcde5f26f97addd7c08a855ba60ab
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

pixman: Symlink /usr/include/pixman.h -> /usr/include/pixman-1/pixman.h
to fix synaptics build.

commit 6fdeb83f993acf6f8df79f5b2b3c58b0ca0e6d89
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

pixman: Conflict with deprecated libpixman.

commit e5f34be2a63a9d6fdecc2a2f768c6a160911b8b1
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xorg-lib/pixman: version update

commit 2e369b146f12c5dd7a74cc63a444e1ba935f0d75
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

pixman: removed unnecessary dependency on gtk+2

commit 6d7e008b80d2f944be0cda7f38c738a8fb8457f0
Author: Ismael E. Luceno <ismael.luceno AT gmail.com>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

pixman: update description & short

commit d44f92f3987c4660faf7ebc65438a2d449a77173
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xorg-lib/pixman: version update

commit 10b1a5f2aad1f7617c2e690021c66dbd668a79d6
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

Merge of pixman

commit 88a891ca2e74d0c85297fd773cf711a251bb438c
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

Revert "pixman-0.10.0"

This reverts commit 7c155f02c773b44743b9ac2b0f85a4b1bf17d019.

Doing the cherry-pick dance

diff --git a/ChangeLog b/ChangeLog
index 5483b3e..10de7d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
-2008-04-11 Treeve Jelbert <treeve AT sourcemage.org>
- * x11-libs/pixman: spell copied from xorg-modular grimoire
+2008-04-11 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * xorg-libs/pixman: merge from -modular

2008-04-11 Ladislav Hagara <hgr AT vabo.cz>
* crypto/libecc: new spell, an elliptic curve crypto library
diff --git a/x11-libs/pixman/DEPENDS b/x11-libs/pixman/DEPENDS
deleted file mode 100755
index 0205dad..0000000
--- a/x11-libs/pixman/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends gtk+2
diff --git a/x11-libs/pixman/DETAILS b/x11-libs/pixman/DETAILS
deleted file mode 100755
index a76093b..0000000
--- a/x11-libs/pixman/DETAILS
+++ /dev/null
@@ -1,13 +0,0 @@
- SPELL=pixman
- VERSION=0.10.0
-
SOURCE_HASH=sha512:a80f2a81a2564a841728c23939cd6ed0e41b1014a4ca4e6cfd72d5c450ecdd2b4b091828252a6973074a8ea8c6732e98073ad00e19dfc42c207428aa83f329db
- SOURCE=${SPELL}-${VERSION}.tar.gz
- SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://xorg.freedesktop.org/";
- LICENSE[0]=XCL
- ENTERED=20070811
- SHORT="Pixman library for xorg-modular."
-cat << EOF
-Pixman library for xorg/cairo
-EOF
diff --git a/x11-libs/pixman/HISTORY b/x11-libs/pixman/HISTORY
deleted file mode 100644
index a4055ae..0000000
--- a/x11-libs/pixman/HISTORY
+++ /dev/null
@@ -1,10 +0,0 @@
-2008-04-11 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.10.0
- new url
-
-2007-09-07 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DETAILS: updated spell to 0.9.5
-
-2007-08-11 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DETAILS, DEPENDS, HISTORY: created spell
- * INSTALL: created spell
diff --git a/x11-libs/pixman/INSTALL b/x11-libs/pixman/INSTALL
deleted file mode 100755
index fc64584..0000000
--- a/x11-libs/pixman/INSTALL
+++ /dev/null
@@ -1,11 +0,0 @@
-default_install &&
-# workarounds for xorg-server
-ln -s ${INSTALL_ROOT}/usr/lib/pkgconfig/pixman-1.pc \
- ${INSTALL_ROOT}/usr/lib/pkgconfig/pixman.pc &&
-ln -s ${INSTALL_ROOT}/usr/include/pixman-1 \
- ${INSTALL_ROOT}/usr/include/pixman &&
-ln -s ${INSTALL_ROOT}/usr/lib/libpixman-1.so \
- ${INSTALL_ROOT}/usr/lib/libpixman.so &&
-ln -s ${INSTALL_ROOT}/usr/lib/libpixman-1.so \
- ${INSTALL_ROOT}/usr/lib/libpixman.so.0
-
diff --git a/xorg-lib/pixman/CONFLICTS b/xorg-lib/pixman/CONFLICTS
new file mode 100755
index 0000000..4c92f96
--- /dev/null
+++ b/xorg-lib/pixman/CONFLICTS
@@ -0,0 +1 @@
+conflicts libpixman y
diff --git a/xorg-lib/pixman/DETAILS b/xorg-lib/pixman/DETAILS
new file mode 100755
index 0000000..0f64380
--- /dev/null
+++ b/xorg-lib/pixman/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=pixman
+ VERSION=0.10.0
+
SOURCE_HASH=sha512:a80f2a81a2564a841728c23939cd6ed0e41b1014a4ca4e6cfd72d5c450ecdd2b4b091828252a6973074a8ea8c6732e98073ad00e19dfc42c207428aa83f329db
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+ SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://xorg.freedesktop.org/";
+ LICENSE[0]=XCL
+ ENTERED=20070811
+ SHORT="The pixel-manipulation library for X and cairo"
+cat << EOF
+pixman is a library that provides low-level pixel manipulation features such
+as image compositing and trapezoid rasterization.
+EOF
diff --git a/xorg-lib/pixman/HISTORY b/xorg-lib/pixman/HISTORY
new file mode 100644
index 0000000..856bcb1
--- /dev/null
+++ b/xorg-lib/pixman/HISTORY
@@ -0,0 +1,35 @@
+2008-04-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.10.0
+ new url
+
+2008-04-11 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * CONFLICTS: removed all the other conflicts
+
+2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Auto-conflicts with xorg as well
+
+2008-03-16 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Auto-conflicts with all prior monolithic X providers
+
+2008-01-25 Juuso Alasuutari <iuso AT sourcemage.org>
+ * CONFLICTS: Added, conflicts with deprecated libpixman.
+ * INSTALL: Added symlink /usr/include/pixman.h ->
+ /usr/include/pixman-1/pixman.h to fix synaptics build.
+
+2007-12-02 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 0.9.6
+
+2007-12-02 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: removed as the gtk+2 dependency is only used for some tests
+ that aren't installed
+
+2007-10-26 Ismael E. Luceno <ismael.luceno AT gmail.com>
+ * DETAILS: update description & short
+
+2007-09-07 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 0.9.5
+
+2007-08-11 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS, DEPENDS, HISTORY: created spell
+ * INSTALL: created spell
+
diff --git a/xorg-lib/pixman/INSTALL b/xorg-lib/pixman/INSTALL
new file mode 100755
index 0000000..8c8d256
--- /dev/null
+++ b/xorg-lib/pixman/INSTALL
@@ -0,0 +1,12 @@
+default_install &&
+# workarounds for xorg-server
+ln -s ${INSTALL_ROOT}/usr/lib/pkgconfig/pixman-1.pc \
+ ${INSTALL_ROOT}/usr/lib/pkgconfig/pixman.pc &&
+ln -s ${INSTALL_ROOT}/usr/include/pixman-1 \
+ ${INSTALL_ROOT}/usr/include/pixman &&
+ln -s ${INSTALL_ROOT}/usr/include/pixman-1/pixman.h \
+ ${INSTALL_ROOT}/usr/include/pixman.h &&
+ln -s ${INSTALL_ROOT}/usr/lib/libpixman-1.so \
+ ${INSTALL_ROOT}/usr/lib/libpixman.so &&
+ln -s ${INSTALL_ROOT}/usr/lib/libpixman-1.so \
+ ${INSTALL_ROOT}/usr/lib/libpixman.so.0



  • [SM-Commit] GIT changes to master grimoire by Andraž 'ruskie' Levstik (d71d5dba77af582de55bea58a8f0a645bb3f90af), Andraž 'ruskie' Levstik, 04/11/2008

Archive powered by MHonArc 2.6.24.

Top of Page