[Git][xorg-team/lib/libepoxy][debian-unstable] 10 commits: Post-release version bump to 1.5.10

["Timo Aaltonen (@tjaalton)" <tjaalton@debian.org>]

Title: GitLab

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

Commits:

• 71dcab0c
  by Emmanuele Bassi at 2021-08-14T14:56:42+01:00

  Post-release version bump to 1.5.10
  

• a07b9b33
  by Seungha Yang at 2021-10-12T02:41:41+09:00

  meson: Fix for building on non-English locale
  
  Specify utf-8 encoding to fix building on non-English locale
  

• 063c1df2
  by Caolán McNamara at 2021-10-20T11:09:09+01:00

  fix error: use of undeclared identifier 'OPENGL_LIB'
  
  at epoxy/src/dispatch_common.c:690 in LibreOffice android build with
  libepoxy-1.5.9
  

• 8db879f8
  by Emmanuele Bassi at 2021-10-25T17:55:28+01:00

  Merge pull request #263 from caolanm/fix_libreoffice_android_build
  
  fix error: use of undeclared identifier 'OPENGL_LIB'

• 9bf47884
  by Alex Richardson at 2022-02-16T19:37:01+00:00

  Add the right include paths for EGL and X11 headers
  
  Libepoxy currently depends on all headers living under the same prefix.
  This is not necessarily true: X11 headers can live in a separate prefix,
  for instance under /opt/X11. This is also the case when cross-compiling to
  a platform that sets up the build environment in non-standard ways.
  
  We could add `x11_dep` and `egl_dep` to the libepoxy target dependencies,
  but that could potentially add spurious linker flags and cause libepoxy to
  depend on libraries it will dlopen() during normal operations.
  
  To avoid that case, we use a partial_dep() object from Meson, and we limit
  the dependency to compiler flags and inclusion paths.
  

• 1c51cfbb
  by Emmanuele Bassi at 2022-02-17T12:55:36+00:00

  Merge pull request #261 from arichardson/custom-prefix-build-fix
  
  Fix build if EGL/X11 headers are in a custom prefix

• c84bc945
  by Emmanuele Bassi at 2022-02-17T12:56:12+00:00

  Merge pull request #262 from seungha-yang/win-non-eng-locale
  
  meson: Fix for building on non-English locale

• 2685cd3e
  by Timo Aaltonen at 2022-04-02T06:35:02+03:00

  Merge branch 'upstream-unstable' into debian-unstable
  

• 93732f1f
  by Timo Aaltonen at 2022-04-02T06:35:54+03:00

  version bump
  

• fa5e3778
  by Timo Aaltonen at 2022-04-02T06:38:07+03:00

  release to sid
  

4 changed files:

• debian/changelog
• meson.build
• src/dispatch_common.c
• src/meson.build

Changes:

debian/changelog

---

	1	+libepoxy (1.5.10-1) unstable; urgency=medium
	2	+
	3	+ * New upstream release.
	4	+
	5	+ -- Timo Aaltonen <tjaalton@debian.org> Sat, 02 Apr 2022 06:37:55 +0300
	6	+
1	7	libepoxy (1.5.9-2) unstable; urgency=medium
2	8
3	9	* Clean up autopkgtest cruft that shouldn't have been included.

meson.build

---

1		-project('libepoxy', 'c', version: '1.5.9',
	1	+project('libepoxy', 'c', version: '1.5.10',
2	2	default_options: [
3	3	'buildtype=debugoptimized',
4	4	'c_std=gnu99',
...	...	@@ -95,6 +95,7 @@ if cc.get_id() == 'msvc'
95	95	'-we4053', # an _expression_ of type void was used as an operand
96	96	'-we4071', # no function prototype given
97	97	'-we4819', # the file contains a character that cannot be represented in the current code page
	98	+ '/utf-8', # Set the input and exec encoding to utf-8, like is the default with GCC
98	99	]
99	100	elif cc.get_id() == 'gcc' or cc.get_id() == 'clang'
100	101	test_cflags = [
...	...	@@ -165,9 +166,11 @@ endif
165	166	dl_dep = cc.find_library('dl', required: false)
166	167	gl_dep = dependency('gl', required: false)
167	168	egl_dep = dependency('egl', required: false)
	169	+elg_headers_dep = egl_dep.partial_dependency(compile_args: true, includes: true)
168	170
169	171	# Optional dependencies for tests
170	172	x11_dep = dependency('x11', required: false)
	173	+x11_headers_dep = x11_dep.partial_dependency(compile_args: true, includes: true)
171	174
172	175	# GLES v2 and v1 may have pkg-config files, courtesy of downstream
173	176	# packagers; let's check those first, and fall back to find_library()

src/dispatch_common.c

---

...	...	@@ -683,7 +683,11 @@ epoxy_load_gl(void)
683	683	#endif
684	684
685	685	if (!api.gl_handle) {
	686	+#if defined(OPENGL_LIB)
686	687	fprintf(stderr, "Couldn't open %s or %s\n", GLX_LIB, OPENGL_LIB);
	688	+#else
	689	+ fprintf(stderr, "Couldn't open %s\n", GLX_LIB);
	690	+#endif
687	691	abort();
688	692	}
689	693

src/meson.build

---

...	...	@@ -59,6 +59,12 @@ epoxy_deps = [ dl_dep, ]
59	59	if host_system == 'windows'
60	60	epoxy_deps += [ opengl32_dep, gdi32_dep ]
61	61	endif
	62	+if enable_x11
	63	+ epoxy_deps += [ x11_headers_dep, ]
	64	+endif
	65	+if build_egl
	66	+ epoxy_deps += [ elg_headers_dep, ]
	67	+endif
62	68
63	69	libepoxy = library(
64	70	'epoxy',

—
View it on GitLab.
You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.