Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libdrm for openSUSE:Factory checked in at 2024-08-29 15:42:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdrm (Old) and /work/SRC/openSUSE:Factory/.libdrm.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdrm" Thu Aug 29 15:42:35 2024 rev:178 rq:1196225 version:2.4.123 Changes: -------- --- /work/SRC/openSUSE:Factory/libdrm/libdrm.changes 2024-06-27 15:58:10.591294423 +0200 +++ /work/SRC/openSUSE:Factory/.libdrm.new.2698/libdrm.changes 2024-08-29 15:42:46.995775039 +0200 @@ -1,0 +2,22 @@ +Tue Aug 27 07:57:17 UTC 2024 - Stefan Dirsch <sndir...@suse.com> + +- update to 2.4.123 + * amdgpu: add new marketing names + * amdgpu: add new marketing names + * Convert to Android.bp + * libs: Tie DSO minor versions to libdrm version + * readdir_r is deprecated. + * Fix FTBS on undefined clock_gettime() and asprintf() + * Export include dirs with -isystem + * Makes libdrm available on host + * Adds libdrm_headers + * Make libdrm recovery_available + * add crosvm to com.android.virt + * Enable GPU in crosvm + * Android.bp: Add include exports for android dir + * Disable ioctl signed overload for Bionic libc + * build: bump version to 2.4.123 + * Delete all Makefile.sources files + * tests: Make modetest and proptest cc_binary in Android.bp + +------------------------------------------------------------------- Old: ---- libdrm-2.4.122.tar.xz New: ---- libdrm-2.4.123.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdrm.spec ++++++ --- /var/tmp/diff_new_pack.5NJUsg/_old 2024-08-29 15:42:47.615800818 +0200 +++ /var/tmp/diff_new_pack.5NJUsg/_new 2024-08-29 15:42:47.615800818 +0200 @@ -24,7 +24,7 @@ Name: libdrm # Please remember to adjust the version in the n_libdrm-drop-valgrind* patches -Version: 2.4.122 +Version: 2.4.123 Release: 0 Summary: Userspace Interface for Kernel DRM Services License: MIT ++++++ libdrm-2.4.122.tar.xz -> libdrm-2.4.123.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/Android.bp new/libdrm-2.4.123/Android.bp --- old/libdrm-2.4.122/Android.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/Android.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,85 @@ +// +// Copyright © 2011-2012 Intel Corporation +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +// + +subdirs = ["*"] +build = ["Android.sources.bp"] + +cc_defaults { + name: "libdrm_defaults", + cflags: [ + // XXX: Consider moving these to config.h analogous to autoconf. + "-DMAJOR_IN_SYSMACROS=1", + "-DHAVE_VISIBILITY=1", + "-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1", + + "-Wall", + "-Werror", + "-Wno-deprecated-declarations", + "-Wno-format", + "-Wno-gnu-variable-sized-type-not-at-end", + "-Wno-implicit-function-declaration", + "-Wno-int-conversion", + "-Wno-missing-field-initializers", + "-Wno-pointer-arith", + "-Wno-unused-parameter", + "-Wno-unused-variable", + ], + export_system_include_dirs: ["."], +} + +cc_library_headers { + name: "libdrm_headers", + vendor_available: true, + host_supported: true, + defaults: ["libdrm_defaults"], + export_include_dirs: ["include/drm", "android"], + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], +} + +// Library for the device +cc_library { + name: "libdrm", + recovery_available: true, + vendor_available: true, + host_supported: true, + defaults: [ + "libdrm_defaults", + "libdrm_sources", + ], + + export_include_dirs: ["include/drm", "android"], + + cflags: [ + "-Wno-enum-conversion", + "-Wno-pointer-arith", + "-Wno-sign-compare", + "-Wno-tautological-compare", + ], + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/Android.common.mk new/libdrm-2.4.123/Android.common.mk --- old/libdrm-2.4.122/Android.common.mk 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/Android.common.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# XXX: Consider moving these to config.h analogous to autoconf. -LOCAL_CFLAGS += \ - -DMAJOR_IN_SYSMACROS=1 \ - -DHAVE_ALLOCA_H=0 \ - -DHAVE_SYS_SELECT_H=0 \ - -DHAVE_SYS_SYSCTL_H=0 \ - -DHAVE_VISIBILITY=1 \ - -fvisibility=hidden \ - -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 - -LOCAL_CFLAGS += \ - -Wno-error \ - -Wno-unused-parameter \ - -Wno-missing-field-initializers \ - -Wno-pointer-arith \ - -Wno-enum-conversion - -# Quiet down the build system and remove any .h files from the sources -LOCAL_SRC_FILES := $(patsubst %.h, , $(LOCAL_SRC_FILES)) -LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH) - -LOCAL_PROPRIETARY_MODULE := true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/Android.mk new/libdrm-2.4.123/Android.mk --- old/libdrm-2.4.122/Android.mk 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/Android.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,74 +0,0 @@ -# -# Copyright © 2011-2012 Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. -# - -LIBDRM_ANDROID_MAJOR_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION))) -ifneq ($(filter 2 4, $(LIBDRM_ANDROID_MAJOR_VERSION)),) -$(error "Android 4.4 and earlier not supported") -endif - -LIBDRM_COMMON_MK := $(call my-dir)/Android.common.mk - -LOCAL_PATH := $(call my-dir) -LIBDRM_TOP := $(LOCAL_PATH) - -include $(CLEAR_VARS) - -# Import variables LIBDRM_{,H,INCLUDE_H,INCLUDE_ANDROID_H,INCLUDE_VMWGFX_H}_FILES -include $(LOCAL_PATH)/Makefile.sources - -#static library for the device (recovery) -include $(CLEAR_VARS) -LOCAL_MODULE := libdrm - -LOCAL_SRC_FILES := $(LIBDRM_FILES) -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/include/drm \ - $(LOCAL_PATH)/android - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include/drm - -include $(LIBDRM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# Shared library for the device -include $(CLEAR_VARS) -LOCAL_MODULE := libdrm - -LOCAL_SRC_FILES := $(LIBDRM_FILES) -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/include/drm \ - $(LOCAL_PATH)/android - -LOCAL_SHARED_LIBRARIES := \ - libcutils - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include/drm - -include $(LIBDRM_COMMON_MK) -include $(BUILD_SHARED_LIBRARY) - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/Android.sources.bp new/libdrm-2.4.123/Android.sources.bp --- old/libdrm-2.4.122/Android.sources.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/Android.sources.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,12 @@ +// Autogenerated with Android.sources.bp.mk + +cc_defaults { + name: "libdrm_sources", + srcs: [ + "xf86drm.c", + "xf86drmHash.c", + "xf86drmRandom.c", + "xf86drmSL.c", + "xf86drmMode.c", + ], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/Android.sources.bp.mk new/libdrm-2.4.123/Android.sources.bp.mk --- old/libdrm-2.4.122/Android.sources.bp.mk 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/Android.sources.bp.mk 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,25 @@ +# Usage: make -f path/to/Android.sources.bp.mk NAMES=<> >Android.sources.bp +# +# It will read the Makefile.sources in the current directory, and +# write <NAME>_FILES to stdout as an Android.bp cc_defaults module. + +.PHONY: all +all: + @# Do nothing + +include Makefile.sources + +empty := +indent := $(empty) $(empty) + +$(info // Autogenerated with Android.sources.bp.mk) +$(foreach NAME,$(NAMES), \ + $(eval lower_name := $(shell echo $(PREFIX)$(NAME) | tr 'A-Z' 'a-z')) \ + $(info ) \ + $(info cc_defaults {) \ + $(info $(indent)name: "$(lower_name)_sources",) \ + $(info $(indent)srcs: [) \ + $(foreach f,$(filter %.c,$($(NAME)_FILES)), \ + $(info $(indent)$(indent)"$(f)",)) \ + $(info $(indent)],) \ + $(info })) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/Makefile.sources new/libdrm-2.4.123/Makefile.sources --- old/libdrm-2.4.122/Makefile.sources 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/Makefile.sources 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ -LIBDRM_FILES := \ - xf86drm.c \ - xf86drmHash.c \ - xf86drmHash.h \ - xf86drmRandom.c \ - xf86drmRandom.h \ - xf86drmSL.c \ - xf86drmMode.c \ - xf86atomic.h \ - libdrm_macros.h \ - libdrm_lists.h \ - util_double_list.h \ - util_math.h - -LIBDRM_H_FILES := \ - libsync.h \ - xf86drm.h \ - xf86drmMode.h - -LIBDRM_INCLUDE_H_FILES := \ - include/drm/drm.h \ - include/drm/drm_fourcc.h \ - include/drm/drm_mode.h \ - include/drm/drm_sarea.h \ - include/drm/i915_drm.h \ - include/drm/mach64_drm.h \ - include/drm/mga_drm.h \ - include/drm/msm_drm.h \ - include/drm/nouveau_drm.h \ - include/drm/qxl_drm.h \ - include/drm/r128_drm.h \ - include/drm/radeon_drm.h \ - include/drm/amdgpu_drm.h \ - include/drm/savage_drm.h \ - include/drm/sis_drm.h \ - include/drm/tegra_drm.h \ - include/drm/vc4_drm.h \ - include/drm/via_drm.h \ - include/drm/virtgpu_drm.h - -LIBDRM_INCLUDE_ANDROID_H_FILES := \ - android/gralloc_handle.h - -LIBDRM_INCLUDE_VMWGFX_H_FILES := \ - include/drm/vmwgfx_drm.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/amdgpu/Android.bp new/libdrm-2.4.123/amdgpu/Android.bp --- old/libdrm-2.4.122/amdgpu/Android.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/amdgpu/Android.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,16 @@ +build = ["Android.sources.bp"] + +cc_library_shared { + name: "libdrm_amdgpu", + + cflags: [ + "-DAMDGPU_ASIC_ID_TABLE=\"/vendor/etc/hwdata/amdgpu.ids\"" + ], + + defaults: [ + "libdrm_defaults", + "libdrm_amdgpu_sources", + ], + vendor: true, + shared_libs: ["libdrm"], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/amdgpu/Android.mk new/libdrm-2.4.123/amdgpu/Android.mk --- old/libdrm-2.4.122/amdgpu/Android.mk 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/amdgpu/Android.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -# Import variables LIBDRM_AMDGPU_FILES, LIBDRM_AMDGPU_H_FILES -include $(LOCAL_PATH)/Makefile.sources - -LOCAL_MODULE := libdrm_amdgpu - -LOCAL_SHARED_LIBRARIES := libdrm - -LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES) - -LOCAL_CFLAGS := \ - -DAMDGPU_ASIC_ID_TABLE=\"/vendor/etc/hwdata/amdgpu.ids\" - -LOCAL_REQUIRED_MODULES := amdgpu.ids - -include $(LIBDRM_COMMON_MK) -include $(BUILD_SHARED_LIBRARY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/amdgpu/Android.sources.bp new/libdrm-2.4.123/amdgpu/Android.sources.bp --- old/libdrm-2.4.122/amdgpu/Android.sources.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/amdgpu/Android.sources.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,15 @@ +// Autogenerated with Android.sources.bp.mk + +cc_defaults { + name: "libdrm_amdgpu_sources", + srcs: [ + "amdgpu_asic_id.c", + "amdgpu_bo.c", + "amdgpu_cs.c", + "amdgpu_device.c", + "amdgpu_gpu_info.c", + "amdgpu_vamgr.c", + "amdgpu_vm.c", + "handle_table.c", + ], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/amdgpu/Makefile.sources new/libdrm-2.4.123/amdgpu/Makefile.sources --- old/libdrm-2.4.122/amdgpu/Makefile.sources 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/amdgpu/Makefile.sources 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -LIBDRM_AMDGPU_FILES := \ - amdgpu_asic_id.c \ - amdgpu_bo.c \ - amdgpu_cs.c \ - amdgpu_device.c \ - amdgpu_gpu_info.c \ - amdgpu_internal.h \ - amdgpu_vamgr.c \ - amdgpu_vm.c \ - handle_table.c \ - handle_table.h - -LIBDRM_AMDGPU_H_FILES := \ - amdgpu.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/amdgpu/meson.build new/libdrm-2.4.123/amdgpu/meson.build --- old/libdrm-2.4.122/amdgpu/meson.build 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/amdgpu/meson.build 2024-08-26 22:10:22.000000000 +0200 @@ -37,7 +37,7 @@ include_directories : [inc_root, inc_drm], link_with : libdrm, dependencies : [dep_threads, dep_atomic_ops, dep_rt], - version : '1.0.0', + version : '1.@0@.0'.format(patch_ver), install : true, ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/data/Android.bp new/libdrm-2.4.123/data/Android.bp --- old/libdrm-2.4.122/data/Android.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/data/Android.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,6 @@ +prebuilt_etc { + name: "amdgpu.ids", + proprietary: true, + sub_dir: "hwdata", + src: "amdgpu.ids", +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/data/Android.mk new/libdrm-2.4.123/data/Android.mk --- old/libdrm-2.4.122/data/Android.mk 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/data/Android.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := amdgpu.ids -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := hwdata -LOCAL_SRC_FILES := $(LOCAL_MODULE) -include $(BUILD_PREBUILT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/data/amdgpu.ids new/libdrm-2.4.123/data/amdgpu.ids --- old/libdrm-2.4.122/data/amdgpu.ids 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/data/amdgpu.ids 2024-08-26 22:10:22.000000000 +0200 @@ -51,6 +51,9 @@ 15BF, CB, AMD Radeon 760M 15BF, CD, AMD Radeon 760M 15BF, CF, AMD Radeon 780M +15BF, D0, AMD Radeon 780M +15BF, D1, AMD Radeon 780M +15BF, D2, AMD Radeon 760M 15BF, D3, AMD Radeon 780M 15BF, D4, AMD Radeon 780M 15BF, D5, AMD Radeon 760M @@ -60,15 +63,19 @@ 15BF, D9, AMD Radeon 780M 15BF, DA, AMD Radeon 780M 15BF, DB, AMD Radeon 760M +15BF, DC, AMD Radeon 780M 15BF, DD, AMD Radeon 780M 15BF, DE, AMD Radeon 740M +15BF, DF, AMD Radeon 760M 15BF, F0, AMD Radeon 760M 15C8, C1, AMD Radeon 740M 15C8, C2, AMD Radeon 740M 15C8, C3, AMD Radeon 740M 15C8, C4, AMD Radeon 740M 15C8, D1, AMD Radeon 740M +15C8, D2, AMD Radeon 740M 15C8, D3, AMD Radeon 740M +15C8, D4, AMD Radeon 740M 15D8, 00, AMD Radeon RX Vega 8 Graphics WS 15D8, 91, AMD Radeon Vega 3 Graphics 15D8, 91, AMD Ryzen Embedded R1606G with Radeon Vega Gfx @@ -459,11 +466,14 @@ 743F, D3, AMD Radeon RX 6550M 743F, D7, AMD Radeon RX 6400 7448, 00, AMD Radeon Pro W7900 +744A, 00, AMD Radeon Pro W7900 Dual Slot 744C, C8, AMD Radeon RX 7900 XTX 744C, CC, AMD Radeon RX 7900 XT 744C, CE, AMD Radeon RX 7900 GRE 744C, CF, AMD Radeon RX 7900M 745E, CC, AMD Radeon Pro W7800 +7460, 00, AMD Radeon Pro V710 +7461, 00, AMD Radeon Pro V710 7470, 00, AMD Radeon Pro W7700 747E, C8, AMD Radeon RX 7800 XT 747E, FF, AMD Radeon RX 7700 XT @@ -477,6 +487,7 @@ 7489, 00, AMD Radeon Pro W7500 74A0, 00, AMD Instinct MI300A 74A1, 00, AMD Instinct MI300X +74B5, 00, AMD Instinct MI300X VF 9830, 00, AMD Radeon HD 8400 / R3 Series 9831, 00, AMD Radeon HD 8400E 9832, 00, AMD Radeon HD 8330 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/etnaviv/Android.bp new/libdrm-2.4.123/etnaviv/Android.bp --- old/libdrm-2.4.122/etnaviv/Android.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/etnaviv/Android.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,11 @@ +build = ["Android.sources.bp"] + +cc_library_shared { + name: "libdrm_etnaviv", + defaults: [ + "libdrm_defaults", + "libdrm_etnaviv_sources", + ], + vendor: true, + shared_libs: ["libdrm"], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/etnaviv/Android.mk new/libdrm-2.4.123/etnaviv/Android.mk --- old/libdrm-2.4.122/etnaviv/Android.mk 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/etnaviv/Android.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -# Import variables LIBDRM_ETNAVIV_FILES, LIBDRM_ETNAVIV_H_FILES -include $(LOCAL_PATH)/Makefile.sources - -LOCAL_MODULE := libdrm_etnaviv - -LOCAL_SHARED_LIBRARIES := libdrm - -LOCAL_SRC_FILES := $(LIBDRM_ETNAVIV_FILES) - -include $(LIBDRM_COMMON_MK) -include $(BUILD_SHARED_LIBRARY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/etnaviv/Android.sources.bp new/libdrm-2.4.123/etnaviv/Android.sources.bp --- old/libdrm-2.4.122/etnaviv/Android.sources.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/etnaviv/Android.sources.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,13 @@ +// Autogenerated with Android.sources.bp.mk + +cc_defaults { + name: "libdrm_etnaviv_sources", + srcs: [ + "etnaviv_device.c", + "etnaviv_gpu.c", + "etnaviv_bo.c", + "etnaviv_bo_cache.c", + "etnaviv_pipe.c", + "etnaviv_cmd_stream.c", + ], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/etnaviv/Makefile.sources new/libdrm-2.4.123/etnaviv/Makefile.sources --- old/libdrm-2.4.122/etnaviv/Makefile.sources 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/etnaviv/Makefile.sources 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -LIBDRM_ETNAVIV_FILES := \ - etnaviv_device.c \ - etnaviv_gpu.c \ - etnaviv_bo.c \ - etnaviv_bo_cache.c \ - etnaviv_perfmon.c \ - etnaviv_pipe.c \ - etnaviv_cmd_stream.c \ - etnaviv_drm.h \ - etnaviv_priv.h - -LIBDRM_ETNAVIV_H_FILES := \ - etnaviv_drmif.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/etnaviv/meson.build new/libdrm-2.4.123/etnaviv/meson.build --- old/libdrm-2.4.122/etnaviv/meson.build 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/etnaviv/meson.build 2024-08-26 22:10:22.000000000 +0200 @@ -33,7 +33,7 @@ c_args : libdrm_c_args, gnu_symbol_visibility : 'hidden', dependencies : [dep_threads, dep_rt, dep_atomic_ops], - version : '1.0.0', + version : '1.@0@.0'.format(patch_ver), install : true, ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/exynos/meson.build new/libdrm-2.4.123/exynos/meson.build --- old/libdrm-2.4.122/exynos/meson.build 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/exynos/meson.build 2024-08-26 22:10:22.000000000 +0200 @@ -26,7 +26,7 @@ include_directories : [inc_root, inc_drm], link_with : libdrm, dependencies : [dep_threads], - version : '1.0.0', + version : '1.@0@.0'.format(patch_ver), install : true, ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/freedreno/Android.mk new/libdrm-2.4.123/freedreno/Android.mk --- old/libdrm-2.4.122/freedreno/Android.mk 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/freedreno/Android.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -# Import variables LIBDRM_FREEDRENO_FILES, LIBDRM_FREEDRENO_H_FILES -include $(LOCAL_PATH)/Makefile.sources - -LOCAL_MODULE := libdrm_freedreno - -LOCAL_SHARED_LIBRARIES := libdrm - -LOCAL_SRC_FILES := $(LIBDRM_FREEDRENO_FILES) - -include $(LIBDRM_COMMON_MK) -include $(BUILD_SHARED_LIBRARY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/freedreno/Makefile.sources new/libdrm-2.4.123/freedreno/Makefile.sources --- old/libdrm-2.4.122/freedreno/Makefile.sources 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/freedreno/Makefile.sources 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -LIBDRM_FREEDRENO_FILES := \ - freedreno_device.c \ - freedreno_pipe.c \ - freedreno_priv.h \ - freedreno_ringbuffer.c \ - freedreno_bo.c \ - freedreno_bo_cache.c \ - msm/msm_bo.c \ - msm/msm_device.c \ - msm/msm_pipe.c \ - msm/msm_priv.h \ - msm/msm_ringbuffer.c - -LIBDRM_FREEDRENO_KGSL_FILES := \ - kgsl/kgsl_bo.c \ - kgsl/kgsl_device.c \ - kgsl/kgsl_drm.h \ - kgsl/kgsl_pipe.c \ - kgsl/kgsl_priv.h \ - kgsl/kgsl_ringbuffer.c \ - kgsl/msm_kgsl.h - -LIBDRM_FREEDRENO_H_FILES := \ - freedreno_drmif.h \ - freedreno_ringbuffer.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/freedreno/meson.build new/libdrm-2.4.123/freedreno/meson.build --- old/libdrm-2.4.122/freedreno/meson.build 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/freedreno/meson.build 2024-08-26 22:10:22.000000000 +0200 @@ -46,7 +46,7 @@ include_directories : [inc_root, inc_drm], dependencies : [dep_valgrind, dep_threads, dep_rt, dep_atomic_ops], link_with : libdrm, - version : '1.0.0', + version : '1.@0@.0'.format(patch_ver), install : true, ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/intel/Android.bp new/libdrm-2.4.123/intel/Android.bp --- old/libdrm-2.4.122/intel/Android.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/intel/Android.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,36 @@ +// +// Copyright © 2011 Intel Corporation +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +// + +build = ["Android.sources.bp"] + +cc_library_shared { + name: "libdrm_intel", + defaults: [ + "libdrm_defaults", + "libdrm_intel_sources", + ], + vendor: true, + + // Removed dependency to libpciaccess: not used on Android + shared_libs: ["libdrm"], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/intel/Android.mk new/libdrm-2.4.123/intel/Android.mk --- old/libdrm-2.4.122/intel/Android.mk 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/intel/Android.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -# -# Copyright © 2011 Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. -# - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -# Import variables LIBDRM_INTEL_FILES, LIBDRM_INTEL_H_FILES -include $(LOCAL_PATH)/Makefile.sources - -LOCAL_MODULE := libdrm_intel - -LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES) - -LOCAL_SHARED_LIBRARIES := \ - libdrm - -include $(LIBDRM_COMMON_MK) -include $(BUILD_SHARED_LIBRARY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/intel/Android.sources.bp new/libdrm-2.4.123/intel/Android.sources.bp --- old/libdrm-2.4.122/intel/Android.sources.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/intel/Android.sources.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,12 @@ +// Autogenerated with Android.sources.bp.mk + +cc_defaults { + name: "libdrm_intel_sources", + srcs: [ + "intel_bufmgr.c", + "intel_bufmgr_fake.c", + "intel_bufmgr_gem.c", + "intel_decode.c", + "mm.c", + ], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/intel/Makefile.sources new/libdrm-2.4.123/intel/Makefile.sources --- old/libdrm-2.4.122/intel/Makefile.sources 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/intel/Makefile.sources 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -LIBDRM_INTEL_FILES := \ - intel_bufmgr.c \ - intel_bufmgr_priv.h \ - intel_bufmgr_fake.c \ - intel_bufmgr_gem.c \ - intel_decode.c \ - intel_chipset.h \ - mm.c \ - mm.h \ - uthash.h - -LIBDRM_INTEL_H_FILES := \ - intel_bufmgr.h \ - intel_aub.h \ - intel_debug.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/intel/meson.build new/libdrm-2.4.123/intel/meson.build --- old/libdrm-2.4.122/intel/meson.build 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/intel/meson.build 2024-08-26 22:10:22.000000000 +0200 @@ -32,7 +32,7 @@ dependencies : [dep_pciaccess, dep_threads, dep_rt, dep_valgrind, dep_atomic_ops], c_args : libdrm_c_args, gnu_symbol_visibility : 'hidden', - version : '1.0.0', + version : '1.@0@.0'.format(patch_ver), install : true, ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/meson.build new/libdrm-2.4.123/meson.build --- old/libdrm-2.4.122/meson.build 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/meson.build 2024-08-26 22:10:22.000000000 +0200 @@ -18,15 +18,22 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. +# The versioning should always stay at 2.4.x. If bumping away from this, +# you must ensure that all users of patch_ver are changed such that DSO versions +# continuously increment (e.g. blindly bumping from 2.4.122 to 2.5.0 would +# roll the libdrm DSO versioning from libdrm.so.2.122.0 back to libdrm.so.2.0.0 +# which would be bad) project( 'libdrm', ['c'], - version : '2.4.122', + version : '2.4.123', license : 'MIT', meson_version : '>= 0.59', default_options : ['buildtype=debugoptimized', 'c_std=c11'], ) +patch_ver = meson.project_version().split('.')[2] + if ['windows', 'darwin'].contains(host_machine.system()) error('unsupported OS: @0@'.format(host_machine.system())) endif @@ -46,6 +53,12 @@ android = cc.compiles('''int func() { return __ANDROID__; }''') +# Solaris / Illumos +if host_machine.system() == 'sunos' + add_global_arguments('-D__EXTENSIONS__', language : 'c') + add_global_arguments('-D_POSIX_C_SOURCE=3', language : 'c') +endif + symbols_check = find_program('symbols-check.py') prog_nm = find_program('nm') @@ -230,6 +243,10 @@ config.set('HAVE_BIG_ENDIAN', 1) endif +if android + config.set('BIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD', 1) +endif + config_file = configure_file( configuration : config, output : 'config.h', @@ -250,7 +267,7 @@ if android libdrm_kw = {} else - libdrm_kw = {'version' : '2.4.0'} + libdrm_kw = { 'version' : '2.@0@.0'.format(patch_ver) } endif libdrm = library( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/nouveau/Android.bp new/libdrm-2.4.123/nouveau/Android.bp --- old/libdrm-2.4.122/nouveau/Android.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/nouveau/Android.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,11 @@ +build = ["Android.sources.bp"] + +cc_library_shared { + name: "libdrm_nouveau", + defaults: [ + "libdrm_defaults", + "libdrm_nouveau_sources", + ], + vendor: true, + shared_libs: ["libdrm"], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/nouveau/Android.mk new/libdrm-2.4.123/nouveau/Android.mk --- old/libdrm-2.4.122/nouveau/Android.mk 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/nouveau/Android.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -# Import variables LIBDRM_NOUVEAU_FILES, LIBDRM_NOUVEAU_H_FILES -include $(LOCAL_PATH)/Makefile.sources - -LOCAL_MODULE := libdrm_nouveau - -LOCAL_SHARED_LIBRARIES := libdrm - -LOCAL_SRC_FILES := $(LIBDRM_NOUVEAU_FILES) - -include $(LIBDRM_COMMON_MK) -include $(BUILD_SHARED_LIBRARY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/nouveau/Android.sources.bp new/libdrm-2.4.123/nouveau/Android.sources.bp --- old/libdrm-2.4.122/nouveau/Android.sources.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/nouveau/Android.sources.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,11 @@ +// Autogenerated with Android.sources.bp.mk + +cc_defaults { + name: "libdrm_nouveau_sources", + srcs: [ + "nouveau.c", + "pushbuf.c", + "bufctx.c", + "abi16.c", + ], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/nouveau/Makefile.sources new/libdrm-2.4.123/nouveau/Makefile.sources --- old/libdrm-2.4.122/nouveau/Makefile.sources 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/nouveau/Makefile.sources 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -LIBDRM_NOUVEAU_FILES := \ - nouveau.c \ - pushbuf.c \ - bufctx.c \ - abi16.c \ - private.h - -LIBDRM_NOUVEAU_H_FILES := \ - nouveau.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/nouveau/meson.build new/libdrm-2.4.123/nouveau/meson.build --- old/libdrm-2.4.122/nouveau/meson.build 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/nouveau/meson.build 2024-08-26 22:10:22.000000000 +0200 @@ -27,7 +27,7 @@ include_directories : [inc_root, inc_drm], link_with : libdrm, dependencies : [dep_threads, dep_atomic_ops], - version : '2.0.0', + version : '2.@0@.0'.format(patch_ver), install : true, ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/omap/Android.bp new/libdrm-2.4.123/omap/Android.bp --- old/libdrm-2.4.122/omap/Android.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/omap/Android.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,12 @@ +build = ["Android.sources.bp"] + +cc_library_shared { + name: "libdrm_omap", + defaults: [ + "libdrm_defaults", + "libdrm_omap_sources", + ], + vendor: true, + + shared_libs: ["libdrm"], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/omap/Android.mk new/libdrm-2.4.123/omap/Android.mk --- old/libdrm-2.4.122/omap/Android.mk 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/omap/Android.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := libdrm_omap -LOCAL_VENDOR_MODULE := true - -LOCAL_SRC_FILES := omap_drm.c - -LOCAL_SHARED_LIBRARIES := libdrm - -include $(LIBDRM_COMMON_MK) - -include $(BUILD_SHARED_LIBRARY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/omap/Android.sources.bp new/libdrm-2.4.123/omap/Android.sources.bp --- old/libdrm-2.4.122/omap/Android.sources.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/omap/Android.sources.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,8 @@ +// Autogenerated with Android.sources.bp.mk + +cc_defaults { + name: "libdrm_omap_sources", + srcs: [ + "omap_drm.c", + ], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/omap/meson.build new/libdrm-2.4.123/omap/meson.build --- old/libdrm-2.4.122/omap/meson.build 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/omap/meson.build 2024-08-26 22:10:22.000000000 +0200 @@ -26,7 +26,7 @@ gnu_symbol_visibility : 'hidden', link_with : libdrm, dependencies : [dep_threads, dep_atomic_ops], - version : '1.0.0', + version : '1.@0@.0'.format(patch_ver), install : true, ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/radeon/Android.bp new/libdrm-2.4.123/radeon/Android.bp --- old/libdrm-2.4.122/radeon/Android.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/radeon/Android.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,11 @@ +build = ["Android.sources.bp"] + +cc_library_shared { + name: "libdrm_radeon", + defaults: [ + "libdrm_defaults", + "libdrm_radeon_sources", + ], + vendor: true, + shared_libs: ["libdrm"], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/radeon/Android.mk new/libdrm-2.4.123/radeon/Android.mk --- old/libdrm-2.4.122/radeon/Android.mk 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/radeon/Android.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -# Import variables LIBDRM_RADEON_FILES, LIBDRM_RADEON_H_FILES -include $(LOCAL_PATH)/Makefile.sources - -LOCAL_MODULE := libdrm_radeon - -LOCAL_SHARED_LIBRARIES := libdrm - -LOCAL_SRC_FILES := $(LIBDRM_RADEON_FILES) - -include $(LIBDRM_COMMON_MK) -include $(BUILD_SHARED_LIBRARY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/radeon/Android.sources.bp new/libdrm-2.4.123/radeon/Android.sources.bp --- old/libdrm-2.4.122/radeon/Android.sources.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/radeon/Android.sources.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,13 @@ +// Autogenerated with Android.sources.bp.mk + +cc_defaults { + name: "libdrm_radeon_sources", + srcs: [ + "radeon_bo_gem.c", + "radeon_cs_gem.c", + "radeon_cs_space.c", + "radeon_bo.c", + "radeon_cs.c", + "radeon_surface.c", + ], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/radeon/Makefile.sources new/libdrm-2.4.123/radeon/Makefile.sources --- old/libdrm-2.4.122/radeon/Makefile.sources 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/radeon/Makefile.sources 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -LIBDRM_RADEON_FILES := \ - radeon_bo_gem.c \ - radeon_cs_gem.c \ - radeon_cs_space.c \ - radeon_bo.c \ - radeon_cs.c \ - radeon_surface.c - -LIBDRM_RADEON_H_FILES := \ - radeon_bo.h \ - radeon_cs.h \ - radeon_surface.h \ - radeon_bo_gem.h \ - radeon_cs_gem.h \ - radeon_bo_int.h \ - radeon_cs_int.h \ - r600_pci_ids.h - -LIBDRM_RADEON_BOF_FILES := \ - bof.c \ - bof.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/radeon/meson.build new/libdrm-2.4.123/radeon/meson.build --- old/libdrm-2.4.122/radeon/meson.build 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/radeon/meson.build 2024-08-26 22:10:22.000000000 +0200 @@ -33,7 +33,7 @@ include_directories : [inc_root, inc_drm], link_with : libdrm, dependencies : [dep_threads, dep_atomic_ops], - version : '1.0.1', + version : '1.@0@.0'.format(patch_ver), install : true, ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/tegra/Android.bp new/libdrm-2.4.123/tegra/Android.bp --- old/libdrm-2.4.122/tegra/Android.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/tegra/Android.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,14 @@ +cc_library_shared { + name: "libdrm_tegra", + vendor: true, + shared_libs: ["libdrm"], + + srcs: ["tegra.c"], + + cflags: [ + "-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1", + "-Wall", + "-Werror", + "-Wno-unused-variable", + ], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/tegra/meson.build new/libdrm-2.4.123/tegra/meson.build --- old/libdrm-2.4.122/tegra/meson.build 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/tegra/meson.build 2024-08-26 22:10:22.000000000 +0200 @@ -31,7 +31,7 @@ dependencies : [dep_threads, dep_atomic_ops], c_args : libdrm_c_args, gnu_symbol_visibility : 'hidden', - version : '0.0.0', + version : '0.@0@.0'.format(patch_ver), install : true, ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/tests/Android.bp new/libdrm-2.4.123/tests/Android.bp --- old/libdrm-2.4.122/tests/Android.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/tests/Android.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,6 @@ +subdirs = ["*"] + +cc_library_headers { + name: "libdrm_test_headers", + export_include_dirs: ["."], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/tests/Android.mk new/libdrm-2.4.123/tests/Android.mk --- old/libdrm-2.4.122/tests/Android.mk 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/tests/Android.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -include $(call all-subdir-makefiles) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/tests/modetest/Android.bp new/libdrm-2.4.123/tests/modetest/Android.bp --- old/libdrm-2.4.122/tests/modetest/Android.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/tests/modetest/Android.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,12 @@ +build = ["Android.sources.bp"] + +cc_binary { + name: "modetest", + defaults: [ + "libdrm_defaults", + "modetest_sources", + ], + + shared_libs: ["libdrm"], + static_libs: ["libdrm_util"], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/tests/modetest/Android.mk new/libdrm-2.4.123/tests/modetest/Android.mk --- old/libdrm-2.4.122/tests/modetest/Android.mk 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/tests/modetest/Android.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -include $(LOCAL_PATH)/Makefile.sources - -LOCAL_SRC_FILES := $(MODETEST_FILES) - -LOCAL_MODULE := modetest - -LOCAL_SHARED_LIBRARIES := libdrm -LOCAL_STATIC_LIBRARIES := libdrm_util - -include $(LIBDRM_COMMON_MK) -include $(BUILD_EXECUTABLE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/tests/modetest/Android.sources.bp new/libdrm-2.4.123/tests/modetest/Android.sources.bp --- old/libdrm-2.4.122/tests/modetest/Android.sources.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/tests/modetest/Android.sources.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,10 @@ +// Autogenerated with Android.sources.bp.mk + +cc_defaults { + name: "modetest_sources", + srcs: [ + "buffers.c", + "cursor.c", + "modetest.c", + ], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/tests/modetest/Makefile.sources new/libdrm-2.4.123/tests/modetest/Makefile.sources --- old/libdrm-2.4.122/tests/modetest/Makefile.sources 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/tests/modetest/Makefile.sources 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -MODETEST_FILES := \ - buffers.c \ - buffers.h \ - cursor.c \ - cursor.h \ - modetest.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/tests/proptest/Android.bp new/libdrm-2.4.123/tests/proptest/Android.bp --- old/libdrm-2.4.122/tests/proptest/Android.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/tests/proptest/Android.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,8 @@ +cc_binary { + name: "proptest", + defaults: ["libdrm_defaults"], + srcs: ["proptest.c"], + + shared_libs: ["libdrm"], + static_libs: ["libdrm_util"], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/tests/proptest/Android.mk new/libdrm-2.4.123/tests/proptest/Android.mk --- old/libdrm-2.4.122/tests/proptest/Android.mk 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/tests/proptest/Android.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -include $(LOCAL_PATH)/Makefile.sources - -LOCAL_SRC_FILES := $(PROPTEST_FILES) - -LOCAL_MODULE := proptest - -LOCAL_SHARED_LIBRARIES := libdrm -LOCAL_STATIC_LIBRARIES := libdrm_util - -include $(LIBDRM_COMMON_MK) -include $(BUILD_EXECUTABLE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/tests/proptest/Makefile.sources new/libdrm-2.4.123/tests/proptest/Makefile.sources --- old/libdrm-2.4.122/tests/proptest/Makefile.sources 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/tests/proptest/Makefile.sources 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -PROPTEST_FILES := \ - proptest.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/tests/util/Android.bp new/libdrm-2.4.123/tests/util/Android.bp --- old/libdrm-2.4.122/tests/util/Android.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/tests/util/Android.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,35 @@ +// +// Copyright © 2015 NVIDIA Corporation +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +// + +build = ["Android.sources.bp"] + +cc_library_static { + name: "libdrm_util", + defaults: [ + "libdrm_defaults", + "libdrm_util_sources", + ], + shared_libs: ["libdrm"], + header_libs: ["libdrm_test_headers"], + export_header_lib_headers: ["libdrm_test_headers"], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/tests/util/Android.mk new/libdrm-2.4.123/tests/util/Android.mk --- old/libdrm-2.4.122/tests/util/Android.mk 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/tests/util/Android.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -# -# Copyright © 2015 NVIDIA Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. -# - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -include $(LOCAL_PATH)/Makefile.sources - -LOCAL_MODULE := libdrm_util - -LOCAL_SHARED_LIBRARIES := libdrm - -LOCAL_SRC_FILES := $(UTIL_FILES) - -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LIBDRM_TOP)/tests - -include $(LIBDRM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/tests/util/Android.sources.bp new/libdrm-2.4.123/tests/util/Android.sources.bp --- old/libdrm-2.4.122/tests/util/Android.sources.bp 1970-01-01 01:00:00.000000000 +0100 +++ new/libdrm-2.4.123/tests/util/Android.sources.bp 2024-08-26 22:10:22.000000000 +0200 @@ -0,0 +1,10 @@ +// Autogenerated with Android.sources.bp.mk + +cc_defaults { + name: "libdrm_util_sources", + srcs: [ + "format.c", + "kms.c", + "pattern.c", + ], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/tests/util/Makefile.sources new/libdrm-2.4.123/tests/util/Makefile.sources --- old/libdrm-2.4.122/tests/util/Makefile.sources 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/tests/util/Makefile.sources 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -UTIL_FILES := \ - common.h \ - format.c \ - format.h \ - kms.c \ - kms.h \ - pattern.c \ - pattern.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.122/vc4/Makefile.sources new/libdrm-2.4.123/vc4/Makefile.sources --- old/libdrm-2.4.122/vc4/Makefile.sources 2024-06-26 10:13:31.000000000 +0200 +++ new/libdrm-2.4.123/vc4/Makefile.sources 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -LIBDRM_VC4_H_FILES := \ - vc4_packet.h \ - vc4_qpu_defines.h