[Git][xorg-team/lib/libglvnd][debian-unstable] 2 commits: add-pkgconfig-support-for-libs.patch: Add missing pkgconfig files for EGL, GL,...

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[Git][xorg-team/lib/libglvnd][debian-unstable] 2 commits: add-pkgconfig-support-for-libs.patch: Add missing pkgconfig files for EGL, GL,...

Timo Aaltonen-4
GitLab

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libglvnd

Commits:

  • 933f9496
    by Timo Aaltonen at 2019-06-27T10:40:40Z
    add-pkgconfig-support-for-libs.patch: Add missing pkgconfig files for EGL, GL, GLX, GLESv1, GLESv2 and OpenGL.
    
  • f4bb1cc0
    by Timo Aaltonen at 2019-06-27T10:49:53Z
    control: Bump libglvnd-dev Breaks/Replaces for libgles2-mesa-dev, glesv2.pc moved here.
    

6 changed files:

Changes:

  • debian/changelog
    1 1
     libglvnd (1.1.1-1) UNRELEASED; urgency=medium
    
    2 2
     
    
    3 3
       * New upstream release. (LP: #1816004)
    
    4
    +  * add-pkgconfig-support-for-libs.patch: Add missing pkgconfig files for
    
    5
    +    EGL, GL, GLX, GLESv1, GLESv2 and OpenGL. (Closes: #930514)
    
    6
    +  * control: Bump libglvnd-dev Breaks/Replaces for libgles2-mesa-dev,
    
    7
    +    glesv2.pc moved here.
    
    4 8
     
    
    5 9
      -- Timo Aaltonen <[hidden email]>  Wed, 13 Mar 2019 20:05:49 +0200
    
    6 10
     
    

  • debian/control
    ... ... @@ -35,12 +35,12 @@ Breaks:
    35 35
      libegl1-mesa-dev (<< 17.2.0~rc4-1),
    
    36 36
      libgl1-mesa-dev (<< 17.2.0~rc4-1),
    
    37 37
      libgles1-mesa-dev (<< 17.0.0~rc3-1),
    
    38
    - libgles2-mesa-dev (<< 17.2.0~rc4-1),
    
    38
    + libgles2-mesa-dev (<< 19.1.0-1),
    
    39 39
     Replaces:
    
    40 40
      libegl1-mesa-dev (<< 17.2.0~rc4-1),
    
    41 41
      libgl1-mesa-dev (<< 17.2.0~rc4-1),
    
    42 42
      libgles1-mesa-dev (<< 17.0.0~rc3-1),
    
    43
    - libgles2-mesa-dev (<< 17.2.0~rc4-1),
    
    43
    + libgles2-mesa-dev (<< 19.1.0-1),
    
    44 44
     Multi-Arch: same
    
    45 45
     Description: Vendor neutral GL dispatch library -- development files
    
    46 46
      This is an implementation of the vendor-neutral dispatch layer for
    

  • debian/libglvnd-core-dev.install
    1 1
     usr/include/glvnd/*.h
    
    2
    -usr/lib/*/pkgconfig/*.pc
    2
    +usr/lib/*/pkgconfig/libglvnd.pc

  • debian/libglvnd-dev.install
    1 1
     usr/lib/*/*.so
    
    2
    +usr/lib/*/pkgconfig/egl.pc
    
    3
    +usr/lib/*/pkgconfig/gl.pc
    
    4
    +usr/lib/*/pkgconfig/glx.pc
    
    5
    +usr/lib/*/pkgconfig/glesv1_cm.pc
    
    6
    +usr/lib/*/pkgconfig/glesv2.pc
    
    7
    +usr/lib/*/pkgconfig/opengl.pc

  • debian/patches/add-pkgconfig-support-for-libs.patch
    1
    +https://github.com/NVIDIA/libglvnd/pull/86
    
    2
    +
    
    3
    +--- a/configure.ac
    
    4
    ++++ b/configure.ac
    
    5
    +@@ -308,11 +308,17 @@ AC_CONFIG_FILES([Makefile
    
    6
    +                  libglvnd.pc
    
    7
    +                  include/Makefile
    
    8
    +                  src/Makefile
    
    9
    ++                 src/GL/gl.pc
    
    10
    +                  src/GL/Makefile
    
    11
    ++                 src/OpenGL/opengl.pc
    
    12
    +                  src/OpenGL/Makefile
    
    13
    ++                 src/GLESv1/glesv1_cm.pc
    
    14
    +                  src/GLESv1/Makefile
    
    15
    ++                 src/GLESv2/glesv2.pc
    
    16
    +                  src/GLESv2/Makefile
    
    17
    ++                 src/GLX/glx.pc
    
    18
    +                  src/GLX/Makefile
    
    19
    ++                 src/EGL/egl.pc
    
    20
    +                  src/EGL/Makefile
    
    21
    +                  src/GLdispatch/Makefile
    
    22
    +                  src/GLdispatch/vnd-glapi/Makefile
    
    23
    +--- a/src/EGL/Makefile.am
    
    24
    ++++ b/src/EGL/Makefile.am
    
    25
    +@@ -67,6 +67,9 @@ libEGL_la_LIBADD += $(UTIL_DIR)/libcJSON
    
    26
    + libEGL_la_LIBADD += $(UTIL_DIR)/libwinsys_dispatch.la
    
    27
    + libEGL_la_LIBADD += libEGL_dispatch_stubs.la
    
    28
    + 
    
    29
    ++pkgconfigdir = $(libdir)/pkgconfig
    
    30
    ++pkgconfig_DATA = egl.pc
    
    31
    ++
    
    32
    + libEGL_la_LDFLAGS = -shared -Wl,-Bsymbolic -version-info 2:0:1 $(LINKER_FLAG_NO_UNDEFINED)
    
    33
    + 
    
    34
    + libEGL_la_SOURCES = \
    
    35
    +--- /dev/null
    
    36
    ++++ b/src/EGL/egl.pc.in
    
    37
    +@@ -0,0 +1,10 @@
    
    38
    ++prefix=@prefix@
    
    39
    ++exec_prefix=${prefix}
    
    40
    ++libdir=@libdir@
    
    41
    ++includedir=@includedir@
    
    42
    ++
    
    43
    ++Name: egl
    
    44
    ++Description: EGL library and headers
    
    45
    ++Version: 1.5
    
    46
    ++Libs: -L${libdir} -lEGL
    
    47
    ++Cflags: -I${includedir}
    
    48
    +--- a/src/GL/Makefile.am
    
    49
    ++++ b/src/GL/Makefile.am
    
    50
    +@@ -70,3 +70,6 @@ libGL_la_LIBADD += ../GLdispatch/libGLdi
    
    51
    + libGL_la_LIBADD += ../GLdispatch/vnd-glapi/libglapi_gl.la
    
    52
    + libGL_la_LIBADD += ../util/libutils_misc.la
    
    53
    + libGL_la_LIBADD += @LIB_DL@
    
    54
    ++
    
    55
    ++pkgconfigdir = $(libdir)/pkgconfig
    
    56
    ++pkgconfig_DATA = gl.pc
    
    57
    +--- /dev/null
    
    58
    ++++ b/src/GL/gl.pc.in
    
    59
    +@@ -0,0 +1,10 @@
    
    60
    ++prefix=@prefix@
    
    61
    ++exec_prefix=${prefix}
    
    62
    ++libdir=@libdir@
    
    63
    ++includedir=@includedir@
    
    64
    ++
    
    65
    ++Name: gl
    
    66
    ++Description: Legacy OpenGL and GLX library and headers
    
    67
    ++Version: 1.2
    
    68
    ++Libs: -L${libdir} -lGL
    
    69
    ++Cflags: -I${includedir}
    
    70
    +--- a/src/GLESv1/Makefile.am
    
    71
    ++++ b/src/GLESv1/Makefile.am
    
    72
    +@@ -38,3 +38,5 @@ libGLESv1_CM_la_LIBADD = \
    
    73
    + 	../GLdispatch/vnd-glapi/libglapi_glesv1.la \
    
    74
    + 	../util/libutils_misc.la
    
    75
    + 
    
    76
    ++pkgconfigdir = $(libdir)/pkgconfig
    
    77
    ++pkgconfig_DATA = glesv1_cm.pc
    
    78
    +--- /dev/null
    
    79
    ++++ b/src/GLESv1/glesv1_cm.pc.in
    
    80
    +@@ -0,0 +1,10 @@
    
    81
    ++prefix=@prefix@
    
    82
    ++exec_prefix=${prefix}
    
    83
    ++libdir=@libdir@
    
    84
    ++includedir=@includedir@
    
    85
    ++
    
    86
    ++Name: glesv1_cm
    
    87
    ++Description: OpenGL ES-CM v1 library and headers
    
    88
    ++Version: 1.0
    
    89
    ++Libs: -L${libdir} -lGLESv1_CM
    
    90
    ++Cflags: -I${includedir}
    
    91
    +--- a/src/GLESv2/Makefile.am
    
    92
    ++++ b/src/GLESv2/Makefile.am
    
    93
    +@@ -38,3 +38,5 @@ libGLESv2_la_LIBADD = \
    
    94
    + 	../GLdispatch/vnd-glapi/libglapi_glesv2.la \
    
    95
    + 	../util/libutils_misc.la
    
    96
    + 
    
    97
    ++pkgconfigdir = $(libdir)/pkgconfig
    
    98
    ++pkgconfig_DATA = glesv2.pc
    
    99
    +--- /dev/null
    
    100
    ++++ b/src/GLESv2/glesv2.pc.in
    
    101
    +@@ -0,0 +1,10 @@
    
    102
    ++prefix=@prefix@
    
    103
    ++exec_prefix=${prefix}
    
    104
    ++libdir=@libdir@
    
    105
    ++includedir=@includedir@
    
    106
    ++
    
    107
    ++Name: gles2
    
    108
    ++Description: OpenGL ES v2/v3 library and headers
    
    109
    ++Version: 3.2
    
    110
    ++Libs: -L${libdir} -lGLESv2
    
    111
    ++Cflags: -I${includedir}
    
    112
    +--- /dev/null
    
    113
    ++++ b/src/GLX/glx.pc.in
    
    114
    +@@ -0,0 +1,10 @@
    
    115
    ++prefix=@prefix@
    
    116
    ++exec_prefix=${prefix}
    
    117
    ++libdir=@libdir@
    
    118
    ++includedir=@includedir@
    
    119
    ++
    
    120
    ++Name: glx
    
    121
    ++Description: GLX library and headers
    
    122
    ++Version: 1.4
    
    123
    ++Libs: -L${libdir} -lGLX
    
    124
    ++Cflags: -I${includedir}
    
    125
    +--- /dev/null
    
    126
    ++++ b/src/OpenGL/opengl.pc.in
    
    127
    +@@ -0,0 +1,10 @@
    
    128
    ++prefix=@prefix@
    
    129
    ++exec_prefix=${prefix}
    
    130
    ++libdir=@libdir@
    
    131
    ++includedir=@includedir@
    
    132
    ++
    
    133
    ++Name: opengl
    
    134
    ++Description: OpenGL (without GLX) headers and interface
    
    135
    ++Version: 4.5
    
    136
    ++Libs: -L${libdir} -lOpenGL
    
    137
    ++Cflags: -I${includedir}
    
    138
    +--- a/src/GLX/Makefile.am
    
    139
    ++++ b/src/GLX/Makefile.am
    
    140
    +@@ -69,3 +69,5 @@ libGLX_la_SOURCES = \
    
    141
    + 	libglxmapping.c \
    
    142
    + 	libglxproto.c
    
    143
    + 
    
    144
    ++pkgconfigdir = $(libdir)/pkgconfig
    
    145
    ++pkgconfig_DATA = glx.pc
    
    146
    +--- a/src/OpenGL/Makefile.am
    
    147
    ++++ b/src/OpenGL/Makefile.am
    
    148
    +@@ -47,3 +47,5 @@ libOpenGL_la_LIBADD = \
    
    149
    + 	../GLdispatch/vnd-glapi/libglapi_opengl.la \
    
    150
    + 	../util/libutils_misc.la
    
    151
    + 
    
    152
    ++pkgconfigdir = $(libdir)/pkgconfig
    
    153
    ++pkgconfig_DATA = opengl.pc

  • debian/patches/series
    1
    -#placeholder
    1
    +add-pkgconfig-support-for-libs.patch