API tools faq
paste
Advertisement
Guest User

pvr.diff

a guest
Jul 5th, 2015
329
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 17.84 KB | None | 0 0
raw download clone embed print report
  1. diff -bur pvr-source.orig/eurasiacon/build/linux2/buildvars.mk pvr-source/eurasiacon/build/linux2/buildvars.mk
  2. --- pvr-source.orig/eurasiacon/build/linux2/buildvars.mk 2013-09-01 13:33:17.000000000 -0400
  3. +++ pvr-source/eurasiacon/build/linux2/buildvars.mk 2014-12-17 03:56:00.000000000 -0500
  4. @@ -42,12 +42,32 @@
  5. # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  6. ### ###########################################################################
  7.  
  8. +# NOTE: You must *not* use the cc-option et al macros in COMMON_FLAGS,
  9. +# COMMON_CFLAGS or COMMON_USER_FLAGS. These flags are shared between
  10. +# host and target, which might use compilers with different capabilities.
  11. +
  12. +# These flags are used for kernel, User C and User C++
  13. +#
  14. +COMMON_FLAGS := -W -Wall
  15. +
  16. +# Some GCC warnings are C only, so we must mask them from C++
  17. +#
  18. +COMMON_CFLAGS := $(COMMON_FLAGS) \
  19. + -Wdeclaration-after-statement -Wno-format-zero-length \
  20. + -Wstrict-prototypes
  21. +
  22. +# User C and User C++ optimization control. Does not affect kernel.
  23. +#
  24. ifeq ($(BUILD),debug)
  25. COMMON_USER_FLAGS := -O0
  26. else
  27. OPTIM ?= -O2
  28. +ifeq ($(USE_LTO),1)
  29. +COMMON_USER_FLAGS := $(OPTIM) -flto
  30. +else
  31. COMMON_USER_FLAGS := $(OPTIM)
  32. endif
  33. +endif
  34.  
  35. # FIXME: We should probably audit the driver for aliasing
  36. #
  37. @@ -58,26 +78,40 @@
  38. #
  39. COMMON_USER_FLAGS += -g
  40.  
  41. -# These flags are used for kernel, User C and User C++
  42. +# User C and User C++ warning flags
  43. #
  44. -COMMON_FLAGS = -W -Wall
  45. -
  46. -# Some GCC warnings are C only, so we must mask them from C++
  47. -#
  48. -COMMON_CFLAGS := $(COMMON_FLAGS) \
  49. - -Wdeclaration-after-statement -Wno-format-zero-length \
  50. - -Wmissing-prototypes -Wstrict-prototypes
  51. +COMMON_USER_FLAGS += \
  52. + -Wpointer-arith -Wunused-parameter \
  53. + -Wmissing-format-attribute
  54.  
  55. # Additional warnings, and optional warnings.
  56. #
  57. -WARNING_CFLAGS := \
  58. - -Wpointer-arith -Wunused-parameter \
  59. - -Wmissing-format-attribute \
  60. +TESTED_TARGET_USER_FLAGS := \
  61. $(call cc-option,-Wno-missing-field-initializers) \
  62. - $(call cc-option,-fdiagnostics-show-option)
  63. + $(call cc-option,-fdiagnostics-show-option) \
  64. + $(call cc-option,-Wno-self-assign) \
  65. + $(call cc-option,-Wno-parentheses-equality)
  66. +TESTED_HOST_USER_FLAGS := \
  67. + $(call host-cc-option,-Wno-missing-field-initializers) \
  68. + $(call host-cc-option,-fdiagnostics-show-option) \
  69. + $(call host-cc-option,-Wno-self-assign) \
  70. + $(call host-cc-option,-Wno-parentheses-equality)
  71. +
  72. +# These flags are clang-specific.
  73. +# -Wno-unused-command-line-argument works around a buggy interaction
  74. +# with ccache, see https://bugzilla.samba.org/show_bug.cgi?id=8118
  75. +# -fcolor-diagnostics force-enables colored error messages which
  76. +# get disabled when ccache is piped through ccache.
  77. +#
  78. +TESTED_TARGET_USER_FLAGS += \
  79. + $(call cc-option,-Qunused-arguments) \
  80. + $(call cc-option,-fcolor-diagnostics)
  81. +TESTED_HOST_USER_FLAGS += \
  82. + $(call host-cc-option,-Qunused-arguments) \
  83. + $(call host-cc-option,-fcolor-diagnostics)
  84.  
  85. ifeq ($(W),1)
  86. -WARNING_CFLAGS += \
  87. +TESTED_TARGET_USER_FLAGS += \
  88. $(call cc-option,-Wbad-function-cast) \
  89. $(call cc-option,-Wcast-qual) \
  90. $(call cc-option,-Wcast-align) \
  91. @@ -97,19 +131,7 @@
  92. $(call cc-option,-Wswitch-default) \
  93. $(call cc-option,-Wvla) \
  94. $(call cc-option,-Wwrite-strings)
  95. -endif
  96. -
  97. -WARNING_CFLAGS += \
  98. - $(call cc-optional-warning,-Wunused-but-set-variable)
  99. -
  100. -HOST_WARNING_CFLAGS := \
  101. - -Wpointer-arith -Wunused-parameter \
  102. - -Wmissing-format-attribute \
  103. - $(call host-cc-option,-Wno-missing-field-initializers) \
  104. - $(call host-cc-option,-fdiagnostics-show-option)
  105. -
  106. -ifeq ($(W),1)
  107. -HOST_WARNING_CFLAGS += \
  108. +TESTED_HOST_USER_FLAGS += \
  109. $(call host-cc-option,-Wbad-function-cast) \
  110. $(call host-cc-option,-Wcast-qual) \
  111. $(call host-cc-option,-Wcast-align) \
  112. @@ -131,12 +153,20 @@
  113. $(call host-cc-option,-Wwrite-strings)
  114. endif
  115.  
  116. -HOST_WARNING_CFLAGS += \
  117. +TESTED_TARGET_USER_FLAGS += \
  118. + $(call cc-optional-warning,-Wunused-but-set-variable)
  119. +TESTED_HOST_USER_FLAGS += \
  120. $(call host-cc-optional-warning,-Wunused-but-set-variable)
  121.  
  122. -KBUILD_WARNING_CFLAGS := \
  123. +KBUILD_FLAGS := \
  124. -Wno-unused-parameter -Wno-sign-compare
  125. -KBUILD_WARNING_CFLAGS += \
  126. +
  127. +TESTED_KBUILD_FLAGS := \
  128. + $(call kernel-cc-option,-Wmissing-include-dirs) \
  129. + $(call kernel-cc-option,-Wno-type-limits) \
  130. + $(call kernel-cc-option,-Wno-pointer-arith) \
  131. + $(call kernel-cc-option,-Wno-aggregate-return) \
  132. + $(call kernel-cc-option,-Wno-unused-but-set-variable) \
  133. $(call kernel-cc-optional-warning,-Wbad-function-cast) \
  134. $(call kernel-cc-optional-warning,-Wcast-qual) \
  135. $(call kernel-cc-optional-warning,-Wcast-align) \
  136. @@ -161,22 +191,31 @@
  137. # User C only
  138. #
  139. ALL_CFLAGS := \
  140. - $(COMMON_USER_FLAGS) $(COMMON_CFLAGS) $(WARNING_CFLAGS) \
  141. + $(COMMON_USER_FLAGS) $(COMMON_CFLAGS) $(TESTED_TARGET_USER_FLAGS) \
  142. $(SYS_CFLAGS)
  143. -
  144. ALL_HOST_CFLAGS := \
  145. - $(COMMON_USER_FLAGS) $(COMMON_CFLAGS) $(HOST_WARNING_CFLAGS)
  146. + $(COMMON_USER_FLAGS) $(COMMON_CFLAGS) $(TESTED_HOST_USER_FLAGS)
  147.  
  148. # User C++ only
  149. #
  150. ALL_CXXFLAGS := \
  151. - $(COMMON_USER_FLAGS) $(COMMON_FLAGS) \
  152. -fno-rtti -fno-exceptions \
  153. - -Wpointer-arith -Wunused-parameter \
  154. + $(COMMON_USER_FLAGS) $(COMMON_FLAGS) $(TESTED_TARGET_USER_FLAGS) \
  155. $(SYS_CXXFLAGS)
  156. -
  157. ALL_HOST_CXXFLAGS := \
  158. - $(COMMON_USER_FLAGS) $(COMMON_CFLAGS) -Wall
  159. + -fno-rtti -fno-exceptions \
  160. + $(COMMON_USER_FLAGS) $(COMMON_FLAGS) $(TESTED_HOST_USER_FLAGS)
  161. +
  162. +# Workaround for some target clangs that don't support -O0 w/ PIC.
  163. +#
  164. +ifeq ($(cc-is-clang),true)
  165. +ALL_CFLAGS := $(patsubst -O0,-O1,$(ALL_CFLAGS))
  166. +ALL_CXXFLAGS := $(patsubst -O0,-O1,$(ALL_CXXFLAGS))
  167. +endif
  168. +
  169. +# Kernel C only
  170. +#
  171. +ALL_KBUILD_CFLAGS := $(COMMON_CFLAGS) $(KBUILD_FLAGS) $(TESTED_KBUILD_FLAGS)
  172.  
  173. # User C and C++
  174. #
  175. @@ -186,27 +225,28 @@
  176. # We can't use it right now because we want to support non-GNU-compatible
  177. # linkers like the Darwin 'ld' which doesn't support -rpath-link.
  178. #
  179. +# For the same reason (Darwin 'ld') don't bother checking for text
  180. +# relocations in host binaries.
  181. +#
  182. ALL_HOST_LDFLAGS := -L$(HOST_OUT)
  183. -ALL_LDFLAGS := -L$(TARGET_OUT) -Xlinker -rpath-link=$(TARGET_OUT)
  184. +ALL_LDFLAGS := \
  185. + -Wl,--warn-shared-textrel \
  186. + -L$(TARGET_OUT) -Xlinker -rpath-link=$(TARGET_OUT)
  187.  
  188. ifneq ($(strip $(TOOLCHAIN)),)
  189. ALL_LDFLAGS += -L$(TOOLCHAIN)/lib -Xlinker -rpath-link=$(TOOLCHAIN)/lib
  190. endif
  191.  
  192. +ifneq ($(strip $(TOOLCHAIN2)),)
  193. +ALL_LDFLAGS += -L$(TOOLCHAIN2)/lib -Xlinker -rpath-link=$(TOOLCHAIN2)/lib
  194. +endif
  195. +
  196. ifneq ($(strip $(LINKER_RPATH)),)
  197. ALL_LDFLAGS += $(addprefix -Xlinker -rpath=,$(LINKER_RPATH))
  198. endif
  199.  
  200. ALL_LDFLAGS += $(SYS_LDFLAGS)
  201.  
  202. -# Kernel C only
  203. -#
  204. -ALL_KBUILD_CFLAGS := $(COMMON_CFLAGS) $(KBUILD_WARNING_CFLAGS) \
  205. - $(call kernel-cc-option,-Wno-type-limits) \
  206. - $(call kernel-cc-option,-Wno-pointer-arith) \
  207. - $(call kernel-cc-option,-Wno-aggregate-return) \
  208. - $(call kernel-cc-option,-Wno-unused-but-set-variable)
  209. -
  210. # This variable contains a list of all modules built by kbuild
  211. ALL_KBUILD_MODULES :=
  212.  
  213. Only in pvr-source/eurasiacon/build/linux2: buildvars.mk.bak
  214. diff -bur pvr-source.orig/eurasiacon/build/linux2/common/android/armv7-a.mk pvr-source/eurasiacon/build/linux2/common/android/armv7-a.mk
  215. --- pvr-source.orig/eurasiacon/build/linux2/common/android/armv7-a.mk 2013-09-01 13:33:17.000000000 -0400
  216. +++ pvr-source/eurasiacon/build/linux2/common/android/armv7-a.mk 2014-12-17 03:56:00.000000000 -0500
  217. @@ -38,16 +38,23 @@
  218. # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  219. ### ###########################################################################
  220.  
  221. -OPTIM := -Os
  222. +OPTIM := -O2
  223.  
  224. ANDROID_ARCH := arm
  225. include ../common/android/arch_common.mk
  226.  
  227. SYS_CFLAGS += -march=armv7-a
  228.  
  229. +ifneq ($(BUILD),debug)
  230. +SYS_CFLAGS += -mthumb
  231. +endif
  232. +
  233. SYS_EXE_CRTBEGIN := $(TOOLCHAIN)/lib/crtbegin_dynamic.o
  234. SYS_EXE_CRTEND := $(TOOLCHAIN)/lib/crtend_android.o
  235.  
  236. +SYS_LIB_CRTBEGIN := $(TOOLCHAIN)/lib/crtbegin_so.o
  237. +SYS_LIB_CRTEND := $(TOOLCHAIN)/lib/crtend_so.o
  238. +
  239. # Handle the removal of the armelf.x and armelf.xsc linker scripts.
  240. ifeq ($(strip $(wildcard $(ANDROID_ROOT)/build/core/armelf.x)),)
  241. # The linker scripts have been removed. We need to use these options
  242. diff -bur pvr-source.orig/eurasiacon/build/linux2/common/android/extra_config.mk pvr-source/eurasiacon/build/linux2/common/android/extra_config.mk
  243. --- pvr-source.orig/eurasiacon/build/linux2/common/android/extra_config.mk 2013-09-01 13:33:17.000000000 -0400
  244. +++ pvr-source/eurasiacon/build/linux2/common/android/extra_config.mk 2015-07-05 00:46:22.457048000 -0400
  245. @@ -40,6 +40,9 @@
  246.  
  247.  
  248. $(eval $(call BothConfigC,ANDROID,))
  249. +$(eval $(call TunableBothConfigMake,PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC,))
  250. +$(eval $(call TunableBothConfigC,PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC,))
  251. +
  252.  
  253.  
  254.  
  255. diff -bur pvr-source.orig/eurasiacon/build/linux2/common/android/features.mk pvr-source/eurasiacon/build/linux2/common/android/features.mk
  256. --- pvr-source.orig/eurasiacon/build/linux2/common/android/features.mk 2013-09-01 13:33:17.000000000 -0400
  257. +++ pvr-source/eurasiacon/build/linux2/common/android/features.mk 2015-07-04 20:57:04.776827000 -0400
  258. @@ -49,10 +49,6 @@
  259. #
  260. SUPPORT_MEMINFO_IDS := 1
  261.  
  262. -# Need multi-process support in PDUMP
  263. -#
  264. -SUPPORT_PDUMP_MULTI_PROCESS := 1
  265. -
  266. # Always print debugging after 5 seconds of no activity
  267. #
  268. CLIENT_DRIVER_DEFAULT_WAIT_RETRIES := 50
  269. @@ -61,6 +57,10 @@
  270. #
  271. OPK_DEFAULT := libpvrANDROID_WSEGL.so
  272.  
  273. +# Need multi-process support in PDUMP
  274. +#
  275. +SUPPORT_PDUMP_MULTI_PROCESS := 1
  276. +
  277. # srvkm is always built, but bufferclass_example is only built
  278. # before EGL_image_external was generally available.
  279. #
  280. @@ -100,6 +100,12 @@
  281. PVR_LINUX_MEM_AREA_POOL_MAX_PAGES ?= 5400
  282.  
  283. ##############################################################################
  284. +# Framebuffer target extension is used to find configs compatible with
  285. +# the framebuffer (added in JB MR1).
  286. +#
  287. +EGL_EXTENSION_ANDROID_FRAMEBUFFER_TARGET := 1
  288. +
  289. +##############################################################################
  290. # EGL connect/disconnect hooks only available since Froyo
  291. # Obsolete in future versions
  292. #
  293. @@ -140,12 +146,11 @@
  294. $(ANDROID_ROOT)/frameworks/native/include \
  295. $(ANDROID_ROOT)/frameworks/native/opengl/include \
  296. $(ANDROID_ROOT)/libnativehelper/include
  297. -# FIXME: This is the old location for the JNI header.
  298. -UNITTEST_INCLUDES += $(ANDROID_ROOT)/dalvik/libnativehelper/include
  299. +UNITTEST_INCLUDES += $(ANDROID_ROOT)/dalvik/libnativehelper
  300. else
  301. UNITTEST_INCLUDES += \
  302. $(ANDROID_ROOT)/frameworks/base/opengl/include \
  303. - $(ANDROID_ROOT)/dalvik/libnativehelper/include
  304. + $(ANDROID_ROOT)/dalvik/libnativehelper/include/nativehelper
  305. endif
  306.  
  307. # But it doesn't have OpenVG headers
  308. @@ -319,6 +324,110 @@
  309. PVR_ANDROID_HAS_CORKSCREW_API := 1
  310. endif
  311.  
  312. +##############################################################################
  313. +# JB MR1 makes the framebuffer HAL obsolete.
  314. +#
  315. +# We also need to support IMPLEMENTATION_DEFINED so gralloc allocates
  316. +# framebuffers and GPU buffers in a 'preferred' format.
  317. +#
  318. +ifeq ($(is_at_least_jellybean_mr1),0)
  319. +SUPPORT_ANDROID_FRAMEBUFFER_HAL := 1
  320. +else
  321. +PVR_ANDROID_HAS_HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED := 1
  322. +endif
  323. +
  324. +##############################################################################
  325. +# JB MR1 introduces cross-process syncs associated with a fd.
  326. +# This requires a new enough kernel version to have the base/sync driver.
  327. +#
  328. +ifeq ($(is_at_least_jellybean_mr1),1)
  329. +EGL_EXTENSION_ANDROID_NATIVE_FENCE_SYNC := 0
  330. +PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC := 0
  331. +endif
  332. +
  333. +##############################################################################
  334. +# JB MR1 introduces new usage bits for the camera HAL and some new formats.
  335. +#
  336. +ifeq ($(is_at_least_jellybean_mr1),1)
  337. +PVR_ANDROID_HAS_GRALLOC_USAGE_HW_CAMERA := 1
  338. +PVR_ANDROID_HAS_HAL_PIXEL_FORMAT_RAW_SENSOR := 1
  339. +PVR_ANDROID_HAS_HAL_PIXEL_FORMAT_BLOB := 1
  340. +endif
  341. +
  342. +##############################################################################
  343. +# JB MR2 adds a new graphics HAL (gralloc) API function, lock_ycbcr(), and
  344. +# a so-called "flexible" YUV format enum.
  345. +#
  346. +ifeq ($(is_at_least_jellybean_mr2),1)
  347. +PVR_ANDROID_HAS_HAL_PIXEL_FORMAT_YCbCr_420_888 := 1
  348. +PVR_ANDROID_GRALLOC_HAS_0_2_FEATURES := 1
  349. +endif
  350. +
  351. +##############################################################################
  352. +# In JB MR2 we can use a native helper library for the unittest wrapper.
  353. +# In earlier versions, we must use a less ideal approach.
  354. +#
  355. +ifeq ($(is_at_least_jellybean_mr2),0)
  356. +PVR_ANDROID_SURFACE_FIELD_NAME := \"mNativeSurface\"
  357. +endif
  358. +
  359. +##############################################################################
  360. +# JB MR2 introduces two new camera HAL formats (Y8, Y16)
  361. +#
  362. +ifeq ($(is_at_least_jellybean_mr2),1)
  363. +PVR_ANDROID_HAS_HAL_PIXEL_FORMAT_Y8 := 1
  364. +PVR_ANDROID_HAS_HAL_PIXEL_FORMAT_Y16 := 1
  365. +endif
  366. +
  367. +##############################################################################
  368. +# KK's EGL wrapper remaps EGLConfigs in the BGRA and BGRX formats to RGBA and
  369. +# RGBX respectively, for CpuConsumer compatibility. It does this because the
  370. +# usage bits for the gralloc allocation are not available to EGL.
  371. +#
  372. +# In this newer platform version, gralloc has been redefined to allow the
  373. +# 'format' parameter to gralloc->alloc() to be ignored for non-USAGE_SW
  374. +# allocations, so long as the bits per channel and sRGB-ness are preserved.
  375. +#
  376. +ifeq ($(is_at_least_kitkat),1)
  377. +PVR_ANDROID_REMAP_HW_ONLY_PIXEL_FORMATS := 1
  378. +endif
  379. +
  380. +##############################################################################
  381. +# Support newer HWC features in KK
  382. +#
  383. +ifeq ($(is_at_least_kitkat),1)
  384. +PVR_ANDROID_HWC_HAS_1_3_FEATURES := 1
  385. +endif
  386. +
  387. +##############################################################################
  388. +# KK eliminated egl.cfg. Only create for older versions.
  389. +#
  390. +ifeq ($(is_at_least_kitkat),0)
  391. +PVR_ANDROID_HAS_EGL_CFG := 1
  392. +endif
  393. +
  394. +##############################################################################
  395. +# KK has a bug in its browser that we need to work around.
  396. +#
  397. +ifeq ($(is_at_least_kitkat),1)
  398. +PVR_ANDROID_RELAX_GRALLOC_MODULE_MAP_CHECKS := 1
  399. +endif
  400. +
  401. +##############################################################################
  402. +# KK's Camera HAL requires that ACTIVE_ARRAY_SIZE specify xmin/ymin first
  403. +#
  404. +ifeq ($(is_at_least_kitkat),1)
  405. +PVR_ANDROID_CAMERA_ACTIVE_ARRAY_SIZE_HAS_XMIN_YMIN := 1
  406. +endif
  407. +
  408. +##############################################################################
  409. +# KitKat added a new memory tracking HAL. This enables gralloc support for
  410. +# the GRAPHICS/GL memtrack types.
  411. +#
  412. +ifeq ($(is_at_least_kitkat),1)
  413. +SUPPORT_ANDROID_MEMTRACK_HAL := 1
  414. +endif
  415. +
  416. # Placeholder for future version handling
  417. #
  418. ifeq ($(is_future_version),1)
  419. Only in pvr-source/eurasiacon/build/linux2/common/android: features.mk.orig
  420. diff -bur pvr-source.orig/eurasiacon/build/linux2/common/android/platform_version.mk pvr-source/eurasiacon/build/linux2/common/android/platform_version.mk
  421. --- pvr-source.orig/eurasiacon/build/linux2/common/android/platform_version.mk 2013-09-01 13:33:17.000000000 -0400
  422. +++ pvr-source/eurasiacon/build/linux2/common/android/platform_version.mk 2015-07-05 04:49:05.829264451 -0400
  423. @@ -45,7 +45,7 @@
  424. cat $(TARGET_ROOT)/product/$(TARGET_PRODUCT)/system/build.prop | \
  425. grep ^ro.build.version.release | cut -f2 -d'=' | cut -f1 -d'-'; \
  426. else \
  427. - echo 4.0.3; \
  428. + echo 5.0; \
  429. fi)
  430.  
  431. define version-starts-with
  432. @@ -71,8 +71,16 @@
  433. PLATFORM_VERSION := 4.0.3
  434. else ifeq ($(call version-starts-with,IceCreamSandwich),1)
  435. PLATFORM_VERSION := 4.0
  436. +else ifeq ($(call version-starts-with,JellyBeanMR1),1)
  437. +PLATFORM_VERSION := 4.2
  438. +else ifeq ($(call version-starts-with,JellyBeanMR),1)
  439. +PLATFORM_VERSION := 4.3
  440. else ifeq ($(call version-starts-with,JellyBean),1)
  441. PLATFORM_VERSION := 4.1
  442. +else ifeq ($(call version-starts-with,KeyLimePie),1)
  443. +PLATFORM_VERSION := 4.4
  444. +else ifeq ($(call version-starts-with,KitKat),1)
  445. +PLATFORM_VERSION := 4.4
  446. else ifeq ($(shell echo $(PLATFORM_VERSION) | grep -qE "[A-Za-z]+"; echo $$?),0)
  447. PLATFORM_VERSION := 5.0
  448. endif
  449. @@ -114,6 +122,18 @@
  450. $(shell ( test $(PLATFORM_VERSION_MAJ) -gt 4 || \
  451. ( test $(PLATFORM_VERSION_MAJ) -eq 4 && \
  452. test $(PLATFORM_VERSION_MIN) -ge 1 ) ) && echo 1 || echo 0)
  453. +is_at_least_jellybean_mr1 := \
  454. + $(shell ( test $(PLATFORM_VERSION_MAJ) -gt 4 || \
  455. + ( test $(PLATFORM_VERSION_MAJ) -eq 4 && \
  456. + test $(PLATFORM_VERSION_MIN) -ge 2 ) ) && echo 1 || echo 0)
  457. +is_at_least_jellybean_mr2 := \
  458. + $(shell ( test $(PLATFORM_VERSION_MAJ) -gt 4 || \
  459. + ( test $(PLATFORM_VERSION_MAJ) -eq 4 && \
  460. + test $(PLATFORM_VERSION_MIN) -ge 3 ) ) && echo 1 || echo 0)
  461. +is_at_least_kitkat := \
  462. + $(shell ( test $(PLATFORM_VERSION_MAJ) -gt 4 || \
  463. + ( test $(PLATFORM_VERSION_MAJ) -eq 4 && \
  464. + test $(PLATFORM_VERSION_MIN) -ge 4 ) ) && echo 1 || echo 0)
  465.  
  466. # FIXME: Assume "future versions" are >=5.0, but we don't really know
  467. is_future_version := \
  468. @@ -123,6 +143,12 @@
  469. # against can avoid compatibility theming and affords better integration.
  470. #
  471. ifeq ($(is_future_version),1)
  472. +API_LEVEL := 20
  473. +else ifeq ($(is_at_least_kitkat),1)
  474. +API_LEVEL := 19
  475. +else ifeq ($(is_at_least_jellybean_mr2),1)
  476. +API_LEVEL := 18
  477. +else ifeq ($(is_at_least_jellybean_mr1),1)
  478. API_LEVEL := 17
  479. else ifeq ($(is_at_least_jellybean),1)
  480. API_LEVEL := 16
  481. Only in pvr-source/eurasiacon/build/linux2/common/android: platform_version.mk.new
  482. diff -bur pvr-source.orig/services4/srvkm/devices/sgx/mmu.c pvr-source/services4/srvkm/devices/sgx/mmu.c
  483. --- pvr-source.orig/services4/srvkm/devices/sgx/mmu.c 2013-09-01 13:33:17.000000000 -0400
  484. +++ pvr-source/services4/srvkm/devices/sgx/mmu.c 2014-01-17 15:44:45.000000000 -0500
  485. @@ -1434,6 +1434,7 @@
  486. PVR_ASSERT(pui32PDEntry[i] == 0);
  487. #endif
  488. #endif
  489. + sDevPAddr.uiAddr = 0;
  490. if(_AllocPageTableMemory (pMMUHeap, ppsPTInfoList[i], &sDevPAddr) != IMG_TRUE)
  491. {
  492. PVR_DPF((PVR_DBG_ERROR, "_DeferredAllocPagetables: ERROR call to _AllocPageTableMemory failed"));
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!