(no subject)

package/x11r7/mesa3d/mesa3d.mk +6 -4

 MESA3D_AUTORECONF = YES
 MESA3D_INSTALL_STAGING = YES

@@ -13,12 +13,14 @@ MESA3D_INSTALL_STAGING = YES
 MESA3D_CONF_OPT = \
 	--disable-egl \
 	--disable-glu \
-	--disable-glw \
-	--disable-glut \
-	--disable-gallium \
+	--disable-selinux \
+	--disable-gallium-llvm \
+	--disable-gallium-egl \
+	--disable-gallium-gbm \
 	--with-driver=dri \
 	--with-dri-drivers=swrast \
-	--disable-static
+	--disable-static \
+	--with-gallium-drivers=swrast
 
 MESA3D_DEPENDENCIES = \
 	xproto_glproto \

@@ -32,4 +34,24 @@ MESA3D_DEPENDENCIES = \
 	host-libxml2 \
 	host-python

Dear Stefan Fr?berg,

Quoted 4 lines · Stefan Fr?berg

package/x11r7/mesa3d/mesa3d.mk +0 -0

@@ -4,8 +4,8 @@
 #
 #############################################################
 

package/x11r7/mesa3d/mesa3d.mk line 9

Quoted 5 lines

package/x11r7/mesa3d/mesa3d.mk +2 -2

-MESA3D_VERSION = 7.10.1
-MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.gz
+MESA3D_VERSION = 8.0.5
+MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.bz2
 MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)

You could probably add MESA3D_LICENSE and MESA3D_LICENSE_FILES in the process.

Quoted 24 lines

package/x11r7/mesa3d/mesa3d.mk +6 -4

 MESA3D_AUTORECONF = YES
 MESA3D_INSTALL_STAGING = YES

@@ -13,12 +13,14 @@ MESA3D_INSTALL_STAGING = YES
 MESA3D_CONF_OPT = \
 	--disable-egl \
 	--disable-glu \
-	--disable-glw \
-	--disable-glut \
-	--disable-gallium \
+	--disable-selinux \
+	--disable-gallium-llvm \
+	--disable-gallium-egl \
+	--disable-gallium-gbm \
 	--with-driver=dri \
 	--with-dri-drivers=swrast \
-	--disable-static
+	--disable-static \
+	--with-gallium-drivers=swrast
 
 MESA3D_DEPENDENCIES = \
 	xproto_glproto \

@@ -32,4 +34,24 @@ MESA3D_DEPENDENCIES = \
 	host-libxml2 \
 	host-python

package/x11r7/mesa3d/mesa3d.mk MESA3D_DEPENDENCIES = \ · line 45

Quoted 10 lines

package/x11r7/mesa3d/mesa3d.mk +9 -0

 
+# Build host "builtin_compiler" that is needed by
+# build process, install it and then do cleanup before
+# starting the actual building.
+# Additionally, we will make certain that the 
+# $(HOST_DIR)/usr/bin/builtin_compiler will be used
+# in actual building process.
+
+define	MESA3D_POST_CONFIGURE_CMDS
+	$(MAKE) CC="$(HOSTCC)" CXX="$(HOSTCXX)" CFLAGS="$(HOST_CFLAGS)" CXXFLAGS="$(HOST_CXXFLAGS)" LDFLAGS="$(HOST_LDFLAGS)"  -C $(@D)/src/glsl builtin_compiler

Can you replace that with:

	$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D)/src/glsl builtin_compiler

package/x11r7/mesa3d/mesa3d.mk MESA3D_DEPENDENCIES = \ · line 48

Quoted 3 lines

package/x11r7/mesa3d/mesa3d.mk +3 -0

+	$(INSTALL) $(@D)/src/glsl/builtin_compiler  -m 755 $(HOST_DIR)/usr/bin
+	$(MAKE) -C $(@D) clean
+	sed -e "s#\.\/builtin_compiler#$(HOST_DIR)/usr/bin/builtin_compiler#g" -i $(@D)/src/glsl/Makefile

Hum, it is not really nice to have a target package that installs something in $(HOST_DIR) (even though it's true quite a few packages are already doing this). An alternative solution would be to have a host-mesa3d package, that builds and installs only the glsl compiler.

Something along the lines of:

MESA3D_DEPENDENCIES += host-mesa3d HOST_MESA3D_CONF_OPT = --disable-as-many-things-as-possible

# We only want to build the glsl compiler
define HOST_MESA3D_BUILD_CMDS

	$(MAKE) -C $(@D)/src/glsl builtin_compiler

endef

# We only install the glsl compiler
define HOST_MESA3D_INSTALL_CMDS

	$(INSTALL) -D $(@D)/src/glsl/builtin_compiler  -m 755 $(HOST_DIR)/usr/bin/glsl-builtin_compiler

endef

And then do a patch to mesa3d configure.ac so that we can pass an explicit path to the glsl compiler and do at configure time:
--with-glsl-compiler=$(HOST_DIR)/usr/bin/glsl-builtin_compiler.

package/x11r7/mesa3d/mesa3d.mk MESA3D_DEPENDENCIES = \ · line 55

Quoted 3 lines

package/x11r7/mesa3d/mesa3d.mk +3 -0

+define	MESA3D_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef

Why do you need to override the build step here? It seems similar to the default one.

Thanks!

Thomas

Updated and renamed version of mesa3d-uclibc-locale.patch for Mesa 8.0.5
URL: http://git.openembedded.org/openembedded-core/plain/meta/recipes-graphics/mesa/mesa/0001-Compile-with-uclibc.patch

Signed-off-by Stefan Fr?berg <[email protected]>

---
 .../mesa3d/mesa3d-0001-Compile-with-uclibc.patch   |   52 ++++++++++++++++++++
 1 files changed, 52 insertions(+), 0 deletions(-)
 create mode 100644 package/x11r7/mesa3d/mesa3d-0001-Compile-with-uclibc.patch

package/x11r7/mesa3d/mesa3d-0001-Compile-with-uclibc.patch new file +0 -0

new file mode 100644
index 0000000..d39270a

Cross-compile patch
URL: http://git.openembedded.org/openembedded-core/plain/meta/recipes-graphics/mesa/mesa/0002-cross-compile.patch

Signed-off-by Stefan Fr?berg <[email protected]>

---
 .../x11r7/mesa3d/mesa3d-0002-cross-compile.patch   |   94 ++++++++++++++++++++
 1 files changed, 94 insertions(+), 0 deletions(-)
 create mode 100644 package/x11r7/mesa3d/mesa3d-0002-cross-compile.patch

package/x11r7/mesa3d/mesa3d-0002-cross-compile.patch new file +0 -0

new file mode 100644
index 0000000..dc8e994

Finally after dosens of reruns got damn Mesa 8.0.5 to compile. The biggest obstacle was src/glsl/builtin_compiler but after searching Net for how others had done it I finally got it.

mesa3d-uclibc-locale.patch did not apply cleanly anymore to this version.
So I had to fetch new one from openembedded repo.
Did take also few other patches from there
and fixed execinfo.h stuff.

Dear Stefan Fr?berg,

Quoted 9 lines · Stefan Fr?berg

Finally after dosens of reruns got damn Mesa 8.0.5 to compile. The biggest obstacle was src/glsl/builtin_compiler but after searching Net for how others had done it I finally got it.

mesa3d-uclibc-locale.patch did not apply cleanly anymore to this version.
So I had to fetch new one from openembedded repo.
Did take also few other patches from there
and fixed execinfo.h stuff.

Thanks. Having five patches with the same title is not correct. And since it seems your five patches are all together needed to get Mesa 8.0.5 to build, then you should simply merge your five patches into just one.

I'm adding specific comments on each patch.

Thanks!

Thomas

Thomas, can you tell a git newbie like me how to make single patch but still keeping that Signed-off line in
each logical file in that single one patch ?

So far I have done the following:

create branch

make some changes
git add those_changes
git commit -s -m "description"

repeat the previous three if necessary

git format-patch -M master

git send-email .......

Dear Stefan Fr?berg,

Quoted 3 lines · Stefan Fr?berg

Thomas, can you tell a git newbie like me how to make single patch but still keeping that Signed-off line in
each logical file in that single one patch ?

I am not sure to understand your question. I think you're confusing the SoB line in the Buildroot patch with the SoB line in the patches that apply on mesa3d, aren't you?

So basically, your final patch should look like this:

=======================================================================
mesa3d: bump to version 8.0.5

Here you explain that you're bumping to 8.0.5, and that it requires new patches, for this reason and that reason, and blablabla.

Signed-off-by Stefan Fr?berg <...>

---
Here git will generate the diff-stat of your overall patch

package/x11r7/mesa3d/mesa3d.mk +0 -0

index ...

... here your changes to mesa3d.mk

package/x11r7/mesa3d/mesa3d-01-something.patch new file +8 -0

index ...
+ mesa3d: fix something
+
+ This is the description of the mesa3d-01-something.patch. You explain
+ what you are doing here.
+
+ Signed-off-by: Stefan Fr?berg <...>
+
+ ... here your mesa3d-01-something.patch ...

package/x11r7/mesa3d/mesa3d-02-something-else.patch new file +8 -0

index ...
+ mesa3d: fix something else
+
+ This is the description of the mesa3d-02-something-else.patch. You explain
+ what you are doing here.
+
+ Signed-off-by: Stefan Fr?berg <...>
+
+ ... here your mesa3d-02-something-else.patch ...

=======================================================================

And that's it. See the recently posted "[Buildroot] [PATCH 20/20]
enlightenment: new package" e-mail. It adds enlightenment.mk and contains a patch to it.

Basically you need *one* Signed-off-by in the commit log of the Git patch that applies to Buildroot. And then one Signed-off-by per patch that you're applying to mesa3d, but those Signed-off-by are *inside* the patch applied to mesa3d, not in the commit log of the Git patch applied to Buildroot.

That's what I meant. Those *inside* Signed-off tags.
How should I add those inside Signed-off tags to individual patches (either my own make or 3rd party)
applied to mesa3d ?

Does git diff command do that ? It does not have -s switch like commit does.

Hello Stefan,

Am 29.12.2012 15:56, schrieb Stefan Fr?berg:

Quoted 6 lines

That's what I meant. Those *inside* Signed-off tags.
How should I add those inside Signed-off tags to individual patches (either my own make or 3rd party)
applied to mesa3d ?

Does git diff command do that ? It does not have -s switch like commit does.

I do my signed off while using 'git format-patch'

git format-patch -s [against_some_branch]

Of course *after* the steps Thomas talked about. ;)

Regards
Carsten

That's what I meant. Those *inside* Signed-off tags.
How should I add those inside Signed-off tags to individual patches (either my own make or 3rd party)
applied to mesa3d ?

Does git diff command do that ? It does not have -s switch like commit does.

Dear Stefan Fr?berg,

Quoted 6 lines · Stefan Fr?berg

That's what I meant. Those *inside* Signed-off tags.
How should I add those inside Signed-off tags to individual patches (either my own make or 3rd party)
applied to mesa3d ?

Does git diff command do that ? It does not have -s switch like commit does.

Ah, ok, I know understand your problem better. You're wondering how to nicely generate patches against the package you're working on.

However, one thing you don't seem to realize is that the Signed-off-by line is just pure text. There's nothing special about this line, so if you have a patch sitting here in your directory, just open your favorite text editor, and add the Signed-off-by line, that's it. You don't need the '-s' option of Git to add the Signed-off-by line.

So basically, you have three choices (ordered below from the poorest to the nicest, in my opinion).

1. Use the raw diff tool

We will use the raw diff tool only. So first, extract one copy of mesa3d source code (outside of Buildroot), and rename the directory:

	tar xf mesa3d-8.0.5.tar.bz2
	mv mesa3d-8.0.5 mesa3d-8.0.5.orig

Extract another copy:

	tar xf mesa3d-8.0.5.tar.bz2

Then, do your modifications in the mesa3d-8.0.5/ directory. The mesa3d-8.0.5.orig/ must be kept unchanged. Once you're done doing your modifications, do:

	diff -ruN mesa3d-8.0.5.orig/ mesa3d-8.0.5/ > mesa3d-01-something.patch

And then, edit mesa3d-01-something.patch with your text editor to add the patch description and the Signed-off-by line.

This method is really poor mainly because it is hard to handle multiple patches with it. I do not recommend it.

2. Use quilt

quilt is a tool that allows to generate a stack of patches. I typically use quilt as follows in the context of Buildroot. I start building a package, and realize it doesn't work. So the package source code has already been extracted in output/build/mesa3d-8.0.5/.

What I do is:

cd output/build/mesa3d-8.0.5/
mkdir patches
quilt new mesa3d-01-something.patch
quilt edit configure.ac
# Do my changes in configure.ac

Then, I can test to build the package against (of course, don't do a make clean, or remove the package directory, or you would loose your patches). You can continue editing more files using "quilt edit <filename>".

You can also add more patches:

quilt new mesa3d-02-something-else.patch
quilt edit ...

At any point, to refresh (i.e generate) the current patch in the patches/ directory, run "quilt refresh". You can move forward and backward through your patches using quilt pop and quilt push.

When you're on a particular patch, you can edit its description using 'quilt header -e'. There, write your patch description and Signed-off-by line.

Once you're happy with your patches, make sure to refresh them all, and then do:

	cp patches/*.patch ${your_buildroot_src}/package/mesa3d/

And that's its.

That's typically the method I use when I have only a few minor modification to make to a package. It is practical because it can be done directly within the build directory of a package.

3. Use Git

To use Git, the easiest way is to fetch the original source code of the package by cloning the official repository of the project, and do the modification here. So, something like:

git clone git://somewhere.org/mesa3d.git
cd mesa3d/
# identify the tag that corresponds to the official release # you're working on, i.e 8.0.5. I'll assume it's called v8.0.5 git branch buildroot-work v8.0.5
git checkout buildroot-work

# Do your work as usual with Git.

# Then, to generate your patches:
git format-patch master

# All patches are named 000x-<something>.patch, so you'll have
# to rename them. Typically, I do:
for i in *.patch; do cp $i ${buildroot_src_dir}/package/mesa3d/mesa3d-$i ; done

Hope this helps,

Thomas

Ah, I was hoping (because Im lazy ;-) ) that I don't need to add manually all those
Signed-off lines.

I was always wondering how other people add all those several inside Signed-off lines when submitting one big patch to this list.

Quoted 3 lines · Stefan Fr?berg

Ah, I was hoping (because Im lazy ;-) ) that I don't need to add manually all those
Signed-off lines.

You don't.

Quoted 2 lines

I was always wondering how other people add all those several inside Signed-off lines when submitting one big patch to this list.

See git help format-patch. This command has an option -s (--signoff) to automatically produce the signed-off lines.

Please read the discussion before saying things that are out of topic.

Stefan is *NOT* talking about adding Signed-off-by lines to Buildroot patches, but Signed-off-by lines to patches against packages in Buildroot, i.e the patches that go in package/<pkg>/<pkg>-something.patch.

And those patches are not necessarily generated with Git. They can be manually generated with diff, generated with quilt, etc.

So, no, the story is not as simple as adding the -s option to git commit or git format-patch, because Stefan is maybe not using git to generate patches for the packages.

Quoted 4 lines · Stefan Fr?berg

That's what I meant. Those *inside* Signed-off tags.
How should I add those inside Signed-off tags to individual patches (either my own make or 3rd party)
applied to mesa3d ?

So basically, you have three choices (ordered below from the poorest to the nicest, in my opinion).

1. Use the raw diff tool

And then, edit mesa3d-01-something.patch with your text editor to add the patch description and the Signed-off-by line.

2. Use quilt

I've found using quilt to be troublesome. For example, you absolutely have to tell quilt what files you are *going* to edit, otherwise, quilt will miss your changes. And this situation happens more often than not; in my experience, it happened quite often that I edited a file because I _knew_ where the failure was, to later find I forgot to tell quilt about that file, and was missing that change in the patch series.

So, I would recommend against using quilt; rather use the package's upstream repository, or at worse, create a temporary git tree just in the package's extracted directory: it's much more convenient and powerfull than using quilt.

Dear Yann E. MORIN,

Quoted 8 lines · Yann E. MORIN

I've found using quilt to be troublesome. For example, you absolutely have to tell quilt what files you are *going* to edit, otherwise, quilt will miss your changes. And this situation happens more often than not; in my experience, it happened quite often that I edited a file because I _knew_ where the failure was, to later find I forgot to tell quilt about that file, and was missing that change in the patch series.

Quoted 4 lines

So, I would recommend against using quilt; rather use the package's upstream repository, or at worse, create a temporary git tree just in the package's extracted directory: it's much more convenient and powerfull than using quilt.

<troll severity="strong">

That's because you're using a prehistoric, basic, limited and feature-less text editor named vim.

Under the modern, wonderful, feature-rich text editor named Emacs, there is something called "quilt-mode". Once you're in quilt mode, Emacs turns all buffers of a quilt-managed project read-only, unless that particular buffer edits a file that has been quilt-added into the current patch.

Therefore, with quilt-mode in place, there is zero chance to incorrectly edit a file you forgot to quilt add.

That said, even though I'm an heavy Emacs user, I'm not using quilt-mode at the moment. I have been hit often enough with this quilt "issue" that I no longer forget to do the quilt add. Or in fact, I always use "quilt edit", which makes sure the file is "quilt added" before starting up my favorite text editor.

</troll>

:-)

Thomas

We "real" programmers just use nano as editor and raw diff as our patch generating tool.
;-)

Stefan, All,

Quoted 3 lines · On Saturday 29 December 2012 Stefan Fr?berg wrote:

We "real" programmers just use nano as editor and raw diff as our patch generating tool.
;-)

Real Programmers use butterflies:

    https://xkcd.com/378/

Regards,
Yann E. MORIN.

Quoted 4 lines · Yann E. MORIN

So, I would recommend against using quilt; rather use the package's upstream repository, or at worse, create a temporary git tree just in the package's extracted directory: it's much more convenient and powerfull than using quilt.

<troll severity="strong">

That's because you're using a prehistoric, basic, limited and feature-less text editor named vim.