[Mesa-dev] [PATCH] gallium/xlib: remove GL_{MAJOR,MINOR,TINY}

[Brian Paul]

On 11/10/2017 10:53 AM, Dylan Baker wrote:
> These variables were removed from autotools in 2008 (sha:
> 80f68e1b6a0e5bd2da799c), but they have lived on here. The Scons build
> meanwhile doesn't set a patch/tiny version at all, just major and minor.
> This patch removes the unused variables and simply sets the version,
> leaving patch/tiny as 0 since that's what the autotools build as been
> doing forever. This shouldn't change any behavior.
>
> cc: Brian Paul <brianp at vmware.com>
> cc: Emil Velikov <emil.velikov at collabora.com>
> Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
> ---
>   src/gallium/targets/libgl-xlib/Makefile.am | 6 +-----
>   1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am
> index a29199fe784..263b0846a42 100644
> --- a/src/gallium/targets/libgl-xlib/Makefile.am
> +++ b/src/gallium/targets/libgl-xlib/Makefile.am
> @@ -20,10 +20,6 @@
>   # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
>   # DEALINGS IN THE SOFTWARE.
>
> -GL_MAJOR = 1
> -GL_MINOR = 5
> -GL_TINY = $(MESA_MAJOR)$(MESA_MINOR)0$(MESA_TINY)
> -
>   if HAVE_SHARED_GLAPI
>   SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
>   endif
> @@ -51,7 +47,7 @@ nodist_EXTRA_lib at GL_LIB@_la_SOURCES = dummy.cpp
>   lib at GL_LIB@_la_SOURCES = xlib.c
>   lib at GL_LIB@_la_LDFLAGS = \
>   	-no-undefined \
> -	-version-number $(GL_MAJOR):$(GL_MINOR):$(GL_TINY) \
> +	-version-number 1:5:0 \
>   	$(BSYMBOLIC) \
>   	$(GC_SECTIONS) \
>   	$(LD_NO_UNDEFINED)
>

Reviewed-by: Brian Paul <brianp at vmware.com>