[waffle] [PATCH 1/7] pkg/archlinux: use configure autodetection
Since waffle 1.4 we have autodetection at configure time.
Let's use it and drop a couple of lines PKGBUILD magic.
Signed-off-by: Emil Velikov emil.l.veli...@gmail.com
---
pkg/archlinux/waffle-1.4.1/PKGBUILD | 6 +-
pkg/archlinux/waffle-git/PKGBUILD | 4
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/pkg/archlinux/waffle-1.4.1/PKGBUILD
b/pkg/archlinux/waffle-1.4.1/PKGBUILD
index e877ddc..5426e4b 100644
--- a/pkg/archlinux/waffle-1.4.1/PKGBUILD
+++ b/pkg/archlinux/waffle-1.4.1/PKGBUILD
@@ -2,7 +2,7 @@
pkgname='waffle'
pkgver='1.4.1'
-pkgrel=1
+pkgrel=2
pkgdesc='a library for choosing window system and OpenGL API at runtime'
arch=('i686' 'x86_64')
url='http://www.waffle-gl.org'
@@ -34,10 +34,6 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-DCMAKE_BUILD_TYPE=Release \
--Dwaffle_has_gbm=1 \
--Dwaffle_has_glx=1 \
--Dwaffle_has_x11_egl=1 \
--Dwaffle_has_wayland=1 \
-Dwaffle_build_manpages=1 \
-Dwaffle_build_htmldocs=1 \
-Dwaffle_build_examples=0
diff --git a/pkg/archlinux/waffle-git/PKGBUILD
b/pkg/archlinux/waffle-git/PKGBUILD
index b5a6d96..e4a86d8 100644
--- a/pkg/archlinux/waffle-git/PKGBUILD
+++ b/pkg/archlinux/waffle-git/PKGBUILD
@@ -43,10 +43,6 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-DCMAKE_BUILD_TYPE=Release \
--Dwaffle_has_glx=1 \
--Dwaffle_has_x11_egl=1 \
--Dwaffle_has_wayland=1 \
--Dwaffle_has_gbm=1 \
-Dwaffle_build_manpages=1 \
-Dwaffle_build_htmldocs=1 \
-Dwaffle_build_examples=0
--
2.1.3
___
waffle mailing list
waffle@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/waffle
Re: [waffle] [PULL] WGL support
On 10/11/14 06:17, Chad Versace wrote: On Sun 09 Nov 2014, Emil Velikov wrote: As mentioned earlier here is a rebase of all the wgl work so far on top of origin/master. Merged to next! So... what does that mean??? That means I'll merge your branch to 'master' after it cooks for a little while and I'm certain Piglit doesn't complain. To answer your branching query from Saturday... Here's a *very tiny* summary of the workflow I'm following in man:gitworkflow(7). - The 'master' branch should always be stable. At any time, it should be safe to cut a release off of master. - The 'next' branch is an integration branch. That's where the interesting action happens. - Topic branches are usually first merged to 'next', unless they are obvious fixes. After baking on 'next' for enough time to reveal any lurking bugs, the same topic branch is then merged to 'master'. - As explained in man:gitworkflow(7), merges between branches always flow upwards and never downwards. That is, maint - master - next and never master - next - Merges are preferred over cherry-picks. As explained in man:gitworkflow(7): Merges have many advantages, so we try to solve as many problems as possible with merges alone. Cherry-picking is still occasionally useful. Most importantly, merging works at the branch level, while cherry-picking works at the commit level. [...] Merges are also easier to understand because merge commit is a promise that all changes from all its parents are now included. There is a tradeoff of course: merges require a more careful branch management. [...] Always commit your fixes to the oldest supported branch that require them. Then (periodically) merge the integration branches upwards intoeach other. [A merging upwards strategy] gives a very controlled flow of fixes. If you notice that you have applied a fix to e.g. master that is also required in maint, you will need to cherry-pick it (using git-cherry-pick(1)) downwards. This will happen a few times and is nothing to worry about unless you do it very frequently. Fwiw although it somewhat makes sense to merge maint into master, I'm personally commit to master and cherry-pick to stable/maint kind of person. Either way, as long as you're ok dealing with conflicts etc. I'll deal with it :P Friendly request - please don't cherry-pick from next onto master. Afaiu one can(is allowed to) rebase next which will cause a bit of ... Cheers, Emil ___ waffle mailing list waffle@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/waffle
Re: [waffle] [PULL] WGL support
On Mon 10 Nov 2014, Emil Velikov wrote: On 10/11/14 06:17, Chad Versace wrote: On Sun 09 Nov 2014, Emil Velikov wrote: - As explained in man:gitworkflow(7), merges between branches always flow upwards and never downwards. That is, maint - master - next and never master - next - Merges are preferred over cherry-picks. As explained in man:gitworkflow(7): Merges have many advantages, so we try to solve as many problems as possible with merges alone. Cherry-picking is still occasionally useful. Most importantly, merging works at the branch level, while cherry-picking works at the commit level. [...] Merges are also easier to understand because merge commit is a promise that all changes from all its parents are now included. There is a tradeoff of course: merges require a more careful branch management. [...] Always commit your fixes to the oldest supported branch that require them. Then (periodically) merge the integration branches upwards intoeach other. [A merging upwards strategy] gives a very controlled flow of fixes. If you notice that you have applied a fix to e.g. master that is also required in maint, you will need to cherry-pick it (using git-cherry-pick(1)) downwards. This will happen a few times and is nothing to worry about unless you do it very frequently. Fwiw although it somewhat makes sense to merge maint into master, I'm personally commit to master and cherry-pick to stable/maint kind of person. Either way, as long as you're ok dealing with conflicts etc. I'll deal with it :P I like the merge conflicts. They make me feel safer, more aware of the global picture. Maybe I'm a masochist :/ Friendly request - please don't cherry-pick from next onto master. Agreed. If had cherry-picked from next onto master in the past, I consider that a mistake. That shouldn't happen again. ___ waffle mailing list waffle@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/waffle
[waffle] [PATCH 2/7] pkg/archlinux: waffle does not link against libegl
As such demote libegl to makedepend/optdepent, so that
one can build waffle, and optionally use x11_egl/gbm/wayland.
Signed-off-by: Emil Velikov emil.l.veli...@gmail.com
---
pkg/archlinux/waffle-git/PKGBUILD | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pkg/archlinux/waffle-git/PKGBUILD
b/pkg/archlinux/waffle-git/PKGBUILD
index e4a86d8..7dea3a1 100644
--- a/pkg/archlinux/waffle-git/PKGBUILD
+++ b/pkg/archlinux/waffle-git/PKGBUILD
@@ -12,7 +12,6 @@ provides=(waffle)
conflicts=(waffle)
depends=(
'libgl' # for glx
- 'libegl'
'libgbm'
'libx11'
'libxcb'
@@ -22,6 +21,8 @@ makedepends=(
'cmake'
'xcb-proto'
+ 'libegl'
+
# for building the docs.
'libxslt'
'docbook-xsl'
@@ -50,6 +51,8 @@ build() {
}
package() {
+ optdepends=('libegl: for x11_egl, gbm or wayland support')
+
cd $srcdir/${_unpackdir}
make DESTDIR=$pkgdir/ install
install -m755 -d $pkgdir/usr/share/licenses/$pkgname
--
2.1.3
___
waffle mailing list
waffle@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/waffle
