debian/changelog | 7 + debian/patches/118-undefined-symbols.patch | 151 +++++++++++++++++++++++++++++ debian/patches/series | 1 3 files changed, 159 insertions(+)
New commits: commit 740d7f6282dfc686556fa46fd0abf8007be608e2 Author: Timo Aaltonen <[email protected]> Date: Thu Sep 20 13:31:37 2012 +0300 release to quantal diff --git a/debian/changelog b/debian/changelog index c22af08..100685a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mesa (9.0~git20120917.7cfd42ce-0ubuntu3) UNRELEASED; urgency=low +mesa (9.0~git20120917.7cfd42ce-0ubuntu3) quantal; urgency=low * Add 118-undefined-symbols.patch, fixing libglapi and libosmesa missing symbols. (LP: #1053088) commit 3a77d01e12ca86bbc4a0d5509506ed07812cae75 Author: Timo Aaltonen <[email protected]> Date: Thu Sep 20 13:30:56 2012 +0300 Add 118-undefined-symbols.patch, fixing libglapi and libosmesa missing symbols. (LP: #1053088) diff --git a/debian/changelog b/debian/changelog index 62f459c..c22af08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mesa (9.0~git20120917.7cfd42ce-0ubuntu3) UNRELEASED; urgency=low + + * Add 118-undefined-symbols.patch, fixing libglapi and libosmesa + missing symbols. (LP: #1053088) + + -- Timo Aaltonen <[email protected]> Thu, 20 Sep 2012 13:25:46 +0300 + mesa (9.0~git20120917.7cfd42ce-0ubuntu2) quantal; urgency=low * Add Recommends on libtxc-dxtn-s2tc0, required by Bastion, Psychonauts, diff --git a/debian/patches/118-undefined-symbols.patch b/debian/patches/118-undefined-symbols.patch new file mode 100644 index 0000000..d1b162c --- /dev/null +++ b/debian/patches/118-undefined-symbols.patch @@ -0,0 +1,151 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'> +<head> +<title>mesa.git - mesa</title> +<meta name='generator' content='cgit v0.9.0.3'/> +<meta name='robots' content='index, nofollow'/> +<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/> +<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/mesa.git/atom/mesa-undefined-symbols.patch?h=master' type='application/atom+xml'/> +</head> +<body> +<div id='cgit'><table id='header'> +<tr> +<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td> +<td class='main'><a href='/cgit/'>index</a> : <a title='mesa.git' href='/cgit/mesa.git/'>mesa.git</a></td><td class='form'><form method='get' action=''> +<select name='h' onchange='this.form.submit();'> +<option value='f10'>f10</option> +<option value='f11'>f11</option> +<option value='f12'>f12</option> +<option value='f13'>f13</option> +<option value='f14'>f14</option> +<option value='f15'>f15</option> +<option value='f16'>f16</option> +<option value='f17'>f17</option> +<option value='f18'>f18</option> +<option value='f7'>f7</option> +<option value='f8'>f8</option> +<option value='f9'>f9</option> +<option value='master' selected='selected'>master</option> +</select> <input type='submit' name='' value='switch'/></form></td></tr> +<tr><td class='sub'>mesa</td><td class='sub right'>Jesse Keating</td></tr></table> +<table class='tabs'><tr><td> +<a href='/cgit/mesa.git/'>summary</a><a href='/cgit/mesa.git/refs/'>refs</a><a href='/cgit/mesa.git/log/mesa-undefined-symbols.patch'>log</a><a class='active' href='/cgit/mesa.git/tree/mesa-undefined-symbols.patch'>tree</a><a href='/cgit/mesa.git/commit/mesa-undefined-symbols.patch'>commit</a><a href='/cgit/mesa.git/diff/mesa-undefined-symbols.patch'>diff</a><a href='/cgit/mesa.git/stats/mesa-undefined-symbols.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/mesa.git/log/mesa-undefined-symbols.patch'> +<select name='qt'> +<option value='grep'>log msg</option> +<option value='author'>author</option> +<option value='committer'>committer</option> +<option value='range'>range</option> +</select> +<input class='txt' type='text' size='10' name='q' value=''/> +<input type='submit' value='search'/> +</form> +</td></tr></table> +<div class='path'>path: <a href='/cgit/mesa.git/tree/'>root</a>/<a href='/cgit/mesa.git/tree/mesa-undefined-symbols.patch'>mesa-undefined-symbols.patch</a></div><div class='content'>blob: 5acc91f586eb63d7b8d7be4316da7ee4ec56451f (<a href='/cgit/mesa.git/plain/mesa-undefined-symbols.patch'>plain</a>) +<table summary='blob content' class='blob'> +<tr><td class='linenumbers'><pre><a class='no' id='n1' name='n1' href='#n1'>1</a> +<a class='no' id='n2' name='n2' href='#n2'>2</a> +<a class='no' id='n3' name='n3' href='#n3'>3</a> +<a class='no' id='n4' name='n4' href='#n4'>4</a> +<a class='no' id='n5' name='n5' href='#n5'>5</a> +<a class='no' id='n6' name='n6' href='#n6'>6</a> +<a class='no' id='n7' name='n7' href='#n7'>7</a> +<a class='no' id='n8' name='n8' href='#n8'>8</a> +<a class='no' id='n9' name='n9' href='#n9'>9</a> +<a class='no' id='n10' name='n10' href='#n10'>10</a> +<a class='no' id='n11' name='n11' href='#n11'>11</a> +<a class='no' id='n12' name='n12' href='#n12'>12</a> +<a class='no' id='n13' name='n13' href='#n13'>13</a> +<a class='no' id='n14' name='n14' href='#n14'>14</a> +<a class='no' id='n15' name='n15' href='#n15'>15</a> +<a class='no' id='n16' name='n16' href='#n16'>16</a> +<a class='no' id='n17' name='n17' href='#n17'>17</a> +<a class='no' id='n18' name='n18' href='#n18'>18</a> +<a class='no' id='n19' name='n19' href='#n19'>19</a> +<a class='no' id='n20' name='n20' href='#n20'>20</a> +<a class='no' id='n21' name='n21' href='#n21'>21</a> +<a class='no' id='n22' name='n22' href='#n22'>22</a> +<a class='no' id='n23' name='n23' href='#n23'>23</a> +<a class='no' id='n24' name='n24' href='#n24'>24</a> +<a class='no' id='n25' name='n25' href='#n25'>25</a> +<a class='no' id='n26' name='n26' href='#n26'>26</a> +<a class='no' id='n27' name='n27' href='#n27'>27</a> +<a class='no' id='n28' name='n28' href='#n28'>28</a> +<a class='no' id='n29' name='n29' href='#n29'>29</a> +<a class='no' id='n30' name='n30' href='#n30'>30</a> +<a class='no' id='n31' name='n31' href='#n31'>31</a> +<a class='no' id='n32' name='n32' href='#n32'>32</a> +<a class='no' id='n33' name='n33' href='#n33'>33</a> +<a class='no' id='n34' name='n34' href='#n34'>34</a> +<a class='no' id='n35' name='n35' href='#n35'>35</a> +<a class='no' id='n36' name='n36' href='#n36'>36</a> +<a class='no' id='n37' name='n37' href='#n37'>37</a> +<a class='no' id='n38' name='n38' href='#n38'>38</a> +<a class='no' id='n39' name='n39' href='#n39'>39</a> +<a class='no' id='n40' name='n40' href='#n40'>40</a> +<a class='no' id='n41' name='n41' href='#n41'>41</a> +<a class='no' id='n42' name='n42' href='#n42'>42</a> +<a class='no' id='n43' name='n43' href='#n43'>43</a> +<a class='no' id='n44' name='n44' href='#n44'>44</a> +<a class='no' id='n45' name='n45' href='#n45'>45</a> +<a class='no' id='n46' name='n46' href='#n46'>46</a> +<a class='no' id='n47' name='n47' href='#n47'>47</a> +<a class='no' id='n48' name='n48' href='#n48'>48</a> +<a class='no' id='n49' name='n49' href='#n49'>49</a> +<a class='no' id='n50' name='n50' href='#n50'>50</a> +<a class='no' id='n51' name='n51' href='#n51'>51</a> +<a class='no' id='n52' name='n52' href='#n52'>52</a> +<a class='no' id='n53' name='n53' href='#n53'>53</a> +<a class='no' id='n54' name='n54' href='#n54'>54</a> +<a class='no' id='n55' name='n55' href='#n55'>55</a> +<a class='no' id='n56' name='n56' href='#n56'>56</a> +<a class='no' id='n57' name='n57' href='#n57'>57</a> +</pre></td> +<td class='lines'><pre><code>From 6a934ff6638352b2c28cf5a7452fed2f32853c17 Mon Sep 17 00:00:00 2001 +From: Anssi Hannula <[email protected]> +Date: Sun, 5 Aug 2012 00:47:06 +0300 +Subject: [PATCH] Fix undefined symbols in libOSMesa and libglapi + +--- + src/mapi/shared-glapi/Makefile.am | 2 +- + src/mesa/Makefile.am | 2 +- + src/mesa/drivers/osmesa/Makefile.am | 6 ++++++ + 3 files changed, 8 insertions(+), 2 deletions(-) + +--- a/src/mapi/shared-glapi/Makefile.am ++++ b/src/mapi/shared-glapi/Makefile.am +@@ -6,7 +6,7 @@ + + lib_LTLIBRARIES = libglapi.la + libglapi_la_SOURCES = $(MAPI_GLAPI_FILES) +-libglapi_la_LDFLAGS = -no-undefined ++libglapi_la_LDFLAGS = -no-undefined -pthread + + include $(GLAPI)/gen/glapi_gen.mk + glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) +--- a/src/mesa/Makefile.am ++++ b/src/mesa/Makefile.am +@@ -124,7 +124,7 @@ + $(MESA_CXX_FILES) \ + $(MESA_ASM_FILES_FOR_ARCH) + +-libmesa_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la ++libmesa_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la -ldl + libmesa_la_LDFLAGS = + + libmesagallium_la_SOURCES = \ +--- a/src/mesa/drivers/osmesa/Makefile.am ++++ b/src/mesa/drivers/osmesa/Makefile.am +@@ -40,6 +40,12 @@ + lib@OSMESA_LIB@_la_LIBADD = \ + $(top_builddir)/src/mesa/libmesa.la \ + $(top_builddir)/src/mapi/glapi/libglapi.la ++lib@OSMESA_LIB@_la_LIBTOOLFLAGS = --tag=CXX ++ ++if HAVE_SHARED_GLAPI ++lib@OSMESA_LIB@_la_LDFLAGS += -L$(top_builddir)/$(LIB_DIR) ++lib@OSMESA_LIB@_la_LIBADD += -lglapi ++endif + + if BUILD_SHARED + # Provide compatibility with scripts for the old Mesa build system for diff --git a/debian/patches/series b/debian/patches/series index 1d3510c..084064c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,3 +13,4 @@ 100_no_abi_tag.patch 101_ubuntu_hidden_glname.patch #117-static-gallium.patch +118-undefined-symbols.patch -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
