aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-11-29Upgrade libepoxy to 1.5.10 am: a01a87cee9 am: 0fc3a0d8bd am: d2758901deandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devSadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/2319292 Change-Id: I13d09a6e5bb810b441c348cbae1aad2db7a75044 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29Upgrade libepoxy to 1.5.10 am: a01a87cee9 am: 0fc3a0d8bdandroid-u-beta-1-gplSadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/2319292 Change-Id: I906501497246301d427f5697bab45e612a99f8e5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29Upgrade libepoxy to 1.5.10 am: a01a87cee9main-16k-with-phonesSadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/2319292 Change-Id: Ib8bce3bdd120fa6e112e1df01a0d422d4bb2b1d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-28Upgrade libepoxy to 1.5.10Sadaf Ebrahimi
This project was upgraded with external_updater. Usage: tools/external_updater/updater.sh update libepoxy For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md Test: TreeHugger Change-Id: I5e4444163a45546704f817a6ee8a43ecdc4a6917
2022-02-17Merge pull request #262 from seungha-yang/win-non-eng-localeEmmanuele Bassi
meson: Fix for building on non-English locale
2022-02-17Merge pull request #261 from arichardson/custom-prefix-build-fixEmmanuele Bassi
Fix build if EGL/X11 headers are in a custom prefix
2022-02-16Add the right include paths for EGL and X11 headersAlex Richardson
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.
2021-10-25Merge pull request #263 from caolanm/fix_libreoffice_android_buildEmmanuele Bassi
fix error: use of undeclared identifier 'OPENGL_LIB'
2021-10-20fix error: use of undeclared identifier 'OPENGL_LIB'Caolán McNamara
at epoxy/src/dispatch_common.c:690 in LibreOffice android build with libepoxy-1.5.9
2021-10-12meson: Fix for building on non-English localeSeungha Yang
Specify utf-8 encoding to fix building on non-English locale
2021-08-14Post-release version bump to 1.5.10Emmanuele Bassi
2021-07-12Merge pull request #257 from batesj/allow_libopenglEmmanuele Bassi
Allow libopengl.so to be used when GLX_LIB is missing
2021-07-02Allow libopengl.so to be used when GLX_LIB is missingJohn Bates
This maintains compatibility with previous behavior of always using GLX_LIB if it is found. The only change is when there is no GLX_LIB. Previous behavior when no GLX_LIB: - abort. New behavior when no GLX_LIB: - Try to load libOpenGL.so as gl_handle (glx_handle remains NULL). - Else, abort. Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2021-06-02Merge sc-mainline-prodt_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Xin Li
Bug: 189946434 Change-Id: Id18e08ce60fc70b8c02b2ea5277a88cbf9f7bf1c
2021-05-21Post-release version bump to 1.5.9Emmanuele Bassi
2021-05-21Merge pull request #254 from anholt/issue-252Emmanuele Bassi
Revert OpenGL/GLX loading changes
2021-05-21Revert "If glvnd library found, do not use libGL.so in epoxy_load_gl"Emmanuele Bassi
Commit dbfa4b20 has introduced a string of regressions in the X server and KWin. This reverts commit dbfa4b209c0712b67dfeb8366c2ebe8503063b52. See: #252
2021-05-21Revert "Do not overwrite glx_handle in epoxy_load_gl if GLX library is ↵Emmanuele Bassi
loaded already" This reverts commit 4994c48172e94ca81c000597e0abc0ea0e682b3c.
2021-04-30Post-release version bump to 1.5.8Emmanuele Bassi
2021-04-30Merge pull request #250 from anholt/ebassi/issues-249Emmanuele Bassi
Remove redeclaration of khronos_uintptr_t
2021-04-30Remove redeclaration of khronos_uintptr_tEmmanuele Bassi
The type is being redeclared because I didn't see the original declaration when I wrote 144cbc9325250081f2eb584ca5deb13aaf1c2433. Fixes: #249
2021-04-30Post-release version bump to 1.5.7Emmanuele Bassi
2021-04-19Merge pull request #247 from anholt/win64-khr-typesEmmanuele Bassi
Support Win64 pointer-sized types
2021-03-31Merge pull request #243 from amezin/masterEmmanuele Bassi
gen_dispatch.py: close output files
2021-03-21Support Win64 pointer-sized typesEmmanuele Bassi
Since we're generating stub types from khrplatform.h because we can't include it reliably, we'll have to deal with some of the fallout of the Win64 types. Fixes: #246
2021-03-06gen_dispatch.py: close output filesAleksandr
Fixes https://github.com/anholt/libepoxy/issues/242
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 93c71b4f52 -s ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseXin Li
ours am: f982739ffc -s ours am: f377eeac6e -s ours am skip reason: Change-Id I574a9b5a6e2aec6a2c6314eb22d3d395246e4f51 with SHA-1 1c4e8768d1 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4ba50cd6cbcbc60518935bca07f3e5a256117cb3
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 93c71b4f52 -s ↵Xin Li
ours am: f982739ffc -s ours am: f377eeac6e -s ours am skip reason: Change-Id I574a9b5a6e2aec6a2c6314eb22d3d395246e4f51 with SHA-1 1c4e8768d1 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3132783e4edd5b265d23b27d43470d6e47e135c3
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 93c71b4f52 -s ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
ours am: f982739ffc -s ours am skip reason: Change-Id I574a9b5a6e2aec6a2c6314eb22d3d395246e4f51 with SHA-1 1c4e8768d1 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0449500e54fc65974cb46b77656562ea45597b95
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 93c71b4f52 -s oursXin Li
am skip reason: Change-Id I574a9b5a6e2aec6a2c6314eb22d3d395246e4f51 with SHA-1 1c4e8768d1 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4105983678f21f26cc108e5d4f9e006b4e98c40d
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I574a9b5a6e2aec6a2c6314eb22d3d395246e4f51 Change-Id: I76733a21c3bb44167641f80ad5b0bba5aeb85b5b
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libepoxy am: f777564138 am: ↵Bob Badour
ab4fab6d9f am: a3222c0eb2 am: cf4126ebe8 Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/1588917 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic482122a0826bda27f9e43c1e930c9ff9d0a02e8
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libepoxy am: f777564138 am: ↵Bob Badour
ab4fab6d9f am: a3222c0eb2 am: cf4126ebe8 Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/1588917 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If91ac9d5633912f9e69b419b8393bc5db0d56f38
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libepoxy am: f777564138 am: ↵Bob Badour
ab4fab6d9f am: a3222c0eb2 Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/1588917 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iae3173e9875fb2e7852c6fb8bf53042b852c885e
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libepoxy am: f777564138 am: ab4fab6d9fBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/1588917 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3a04fc879b801ed0933e165a5391df1d595b52fe
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libepoxy am: f777564138Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/1588917 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I36a55d247705eeca4a3efe40735885102fe00d0e
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/libepoxyandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ifbb72fa9f9b57a77763bc89c6a533aef14cb54cf
2021-01-20Merge pull request #238 from anholt/pull-229-altEmmanuele Bassi
Fix some bugs in loading OpenGL/GLX/EGL libraries
2021-01-20Merge pull request #231 from xclaesse/meson-varsEmmanuele Bassi
meson: Set same variables in declare_dependency() as in pkgconfig
2021-01-20meson: Set same variables in declare_dependency() as in pkgconfigXavier Claessens
GTK currently fails to detect if epoxy has been built with EGL on Windows when epoxy is a subproject. To fix that it needs to get that information from the dependency variables. This requires Meson >=0.54.0 for setting variables in declare_dependency().
2021-01-20Do not overwrite glx_handle in epoxy_load_gl if GLX library is loaded alreadyYaroslav Isakov
Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
2021-01-20If glvnd library found, do not use libGL.so in epoxy_load_glYaroslav Isakov
Without additional check, even if libOpenGL was loaded, libGL.so will be loaded as well, and used both in gl_handle and glx_handle, so libglvnd libraries will not be used. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
2020-12-23Merge pull request #236 from anholt/ebassi/ci-splitEmmanuele Bassi
ci: Split Linux and macOS pipelines
2020-12-23Add a badge for the project licenseEmmanuele Bassi
2020-12-23Update the CI status badgesEmmanuele Bassi
Use the badges from GitHub Actions.
2020-12-23ci: Split Linux and macOS pipelinesEmmanuele Bassi
Don't use a single pipeline for everything.
2020-12-23Merge pull request #235 from anholt/github-ciEmmanuele Bassi
Move CI to GitHub
2020-12-23ci: Drop tests from MSYS2 pipelineEmmanuele Bassi
The WGL tests are failing, likely because of some set up issue; for the time being, we care more about building Epoxy, rather than testing it.
2020-12-23ci: Remove AppVeyor pipelineEmmanuele Bassi
We have MSYS2 and MSVC pipelines on GitHub Actions.
2020-12-23ci: Remove TravisEmmanuele Bassi
The GitHub Actions pipeline replaces Travis in any way it matters.
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 11:27:08 +0000