API tools faq
paste
Advertisement
Guest User

0002-vocore2-fixup2.patch

a guest
Oct 24th, 2019
290
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 33.57 KB | None | 0 0
raw download clone embed print report
  1. From af08e3a3ee69d6bf7b37e3e8929293cddb57c8e8 Mon Sep 17 00:00:00 2001
  2. From: Petr Cvek <petrcvekcz@gmail.com>
  3. Date: Thu, 24 Oct 2019 01:34:30 +0200
  4. Subject: [PATCH 2/2] vocore2 fixup2
  5.  
  6. ---
  7. arch/Config.in.mips                           |   2 +-
  8.  package/Makefile.in                           |   2 +
  9.  package/ffmpeg/0001-softfloat.patch           |  16 +
  10.  package/gcc/gcc.mk                            |   3 +-
  11.  package/irrlicht/0003-xorg-path.patch         | 312 ++++++++++++++++++
  12.  package/irrlicht/0003-xorg-path2.patch        |  12 +
  13.  package/libgpg-error/0001-namespace.patch     |  51 +++
  14.  package/libgpg-error/libgpg-error.mk          |   2 +
  15.  package/llvm/Config.in                        |   4 +-
  16.  package/luajit/Config.in                      |   6 +-
  17.  package/luajit/luajit.hash                    |   2 +-
  18.  package/luajit/luajit.mk                      |   3 +-
  19.  package/mesa3d/Config.in                      |   4 +-
  20.  package/openjdk-bin/openjdk-bin.hash          |   2 +-
  21.  package/openjdk-bin/openjdk-bin.mk            |  11 +-
  22.  package/openjdk/Config.in                     |  14 +-
  23.  package/p7zip/0001-long.patch                 |  24 ++
  24.  package/pixman/pixman.mk                      |   2 +
  25.  package/sdl_mixer/sdl_mixer.mk                |   1 -
  26.  .../xserver_xorg-server.mk                    |   2 +-
  27.  toolchain/Config.in                           |   5 +
  28.  .../Config.in.options                         |   4 +
  29.  22 files changed, 460 insertions(+), 24 deletions(-)
  30.  create mode 100644 package/ffmpeg/0001-softfloat.patch
  31.  create mode 100644 package/irrlicht/0003-xorg-path.patch
  32.  create mode 100644 package/irrlicht/0003-xorg-path2.patch
  33.  create mode 100644 package/libgpg-error/0001-namespace.patch
  34.  create mode 100644 package/p7zip/0001-long.patch
  35.  
  36. diff --git a/arch/Config.in.mips b/arch/Config.in.mips
  37. index 619456c2d5..5f6ab81e6a 100644
  38. --- a/arch/Config.in.mips
  39. +++ b/arch/Config.in.mips
  40. @@ -241,7 +241,7 @@ config BR2_ENDIAN
  41.  
  42.  config BR2_GCC_TARGET_ARCH
  43.     default "mips32"    if BR2_mips_32
  44. -   default "mips32r2"  if BR2_mips_32r2
  45. +   default "24kec"     if BR2_mips_32r2
  46.     default "mips32r3"  if BR2_mips_32r3
  47.     default "mips32r5"  if BR2_mips_32r5
  48.     default "mips32r6"  if BR2_mips_32r6
  49. diff --git a/package/Makefile.in b/package/Makefile.in
  50. index 0a7899c852..49d4a041cf 100644
  51. --- a/package/Makefile.in
  52. +++ b/package/Makefile.in
  53. @@ -115,6 +115,8 @@ endif
  54.  STAGING_SUBDIR = $(GNU_TARGET_NAME)/sysroot
  55.  STAGING_DIR    = $(HOST_DIR)/$(STAGING_SUBDIR)
  56.  
  57. +#TARGET_OPTIMIZATION = $(BR2_TARGET_OPTIMIZATION)
  58. +
  59.  ifeq ($(BR2_OPTIMIZE_0),y)
  60.  TARGET_OPTIMIZATION = -O0
  61.  endif
  62. diff --git a/package/ffmpeg/0001-softfloat.patch b/package/ffmpeg/0001-softfloat.patch
  63. new file mode 100644
  64. index 0000000000..6a8d178fa6
  65. --- /dev/null
  66. +++ b/package/ffmpeg/0001-softfloat.patch
  67. @@ -0,0 +1,16 @@
  68. +diff -ur ffmpeg-4.2_old/libavfilter/vf_drawtext.c ffmpeg-4.2_new/libavfilter/vf_drawtext.c
  69. +--- ffmpeg-4.2_old/libavfilter/vf_drawtext.c   2019-08-05 22:52:21.000000000 +0200
  70. ++++ ffmpeg-4.2_new/libavfilter/vf_drawtext.c   2019-08-27 22:59:46.533674111 +0200
  71. +@@ -1083,10 +1083,12 @@
  72. +
  73. +     feclearexcept(FE_ALL_EXCEPT);
  74. +     intval = res;
  75. ++#if 0 //pc2005 soft
  76. +     if ((ret = fetestexcept(FE_INVALID|FE_OVERFLOW|FE_UNDERFLOW))) {
  77. +         av_log(ctx, AV_LOG_ERROR, "Conversion of floating-point result to int failed. Control register: 0x%08x. Conversion result: %d\n", ret, intval);
  78. +         return AVERROR(EINVAL);
  79. +     }
  80. ++#endif
  81. +
  82. +     if (argc == 3)
  83. +         av_strlcatf(fmt_str, sizeof(fmt_str), "0%u", positions);
  84. diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
  85. index 86e1d4df51..1aad4cc090 100644
  86. --- a/package/gcc/gcc.mk
  87. +++ b/package/gcc/gcc.mk
  88. @@ -182,7 +182,8 @@ endif
  89.  
  90.  # Determine arch/tune/abi/cpu options
  91.  ifneq ($(GCC_TARGET_ARCH),)
  92. -HOST_GCC_COMMON_CONF_OPTS += --with-arch="$(GCC_TARGET_ARCH)"
  93. +#HOST_GCC_COMMON_CONF_OPTS += --with-arch="$(GCC_TARGET_ARCH)"
  94. +HOST_GCC_COMMON_CONF_OPTS += --with-arch="24kec"
  95.  endif
  96.  ifneq ($(GCC_TARGET_ABI),)
  97.  HOST_GCC_COMMON_CONF_OPTS += --with-abi="$(GCC_TARGET_ABI)"
  98. diff --git a/package/irrlicht/0003-xorg-path.patch b/package/irrlicht/0003-xorg-path.patch
  99. new file mode 100644
  100. index 0000000000..57806d5689
  101. --- /dev/null
  102. +++ b/package/irrlicht/0003-xorg-path.patch
  103. @@ -0,0 +1,312 @@
  104. +diff -ur irrlicht-1.8.4_old/examples/02.Quake3Map/Makefile irrlicht-1.8.4/examples/02.Quake3Map/Makefile
  105. +--- irrlicht-1.8.4_old/examples/02.Quake3Map/Makefile  2012-11-03 19:08:50.000000000 +0100
  106. ++++ irrlicht-1.8.4/examples/02.Quake3Map/Makefile  2019-09-07 14:47:15.391426592 +0200
  107. +@@ -5,7 +5,7 @@
  108. + Sources = main.cpp
  109. +
  110. + # general compiler settings
  111. +-CPPFLAGS = -I../../include -I/usr/X11R6/include
  112. ++CPPFLAGS = -I../../include -I/usr/include
  113. + CXXFLAGS = -O3 -ffast-math
  114. + #CXXFLAGS = -g -Wall
  115. +
  116. +@@ -17,7 +17,7 @@
  117. + endif
  118. +
  119. + # target specific settings
  120. +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
  121. ++all_linux: LDFLAGS = -L/usr/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
  122. + all_linux clean_linux: SYSTEM=Linux
  123. + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht
  124. + static_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -lm
  125. +diff -ur irrlicht-1.8.4_old/examples/03.CustomSceneNode/Makefile irrlicht-1.8.4/examples/03.CustomSceneNode/Makefile
  126. +--- irrlicht-1.8.4_old/examples/03.CustomSceneNode/Makefile    2012-11-03 19:08:50.000000000 +0100
  127. ++++ irrlicht-1.8.4/examples/03.CustomSceneNode/Makefile    2019-09-07 14:46:45.489800413 +0200
  128. +@@ -5,7 +5,7 @@
  129. + Sources = main.cpp
  130. +
  131. + # general compiler settings
  132. +-CPPFLAGS = -I../../include -I/usr/X11R6/include
  133. ++CPPFLAGS = -I../../include -I/usr/include
  134. + CXXFLAGS = -O3 -ffast-math
  135. + #CXXFLAGS = -g -Wall
  136. +
  137. +@@ -17,7 +17,7 @@
  138. + endif
  139. +
  140. + # target specific settings
  141. +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
  142. ++all_linux: LDFLAGS = -L/usr/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
  143. + all_linux clean_linux: SYSTEM=Linux
  144. + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
  145. + all_win32 clean_win32: SYSTEM=Win32-gcc
  146. +diff -ur irrlicht-1.8.4_old/examples/04.Movement/Makefile irrlicht-1.8.4/examples/04.Movement/Makefile
  147. +--- irrlicht-1.8.4_old/examples/04.Movement/Makefile   2012-11-03 19:08:50.000000000 +0100
  148. ++++ irrlicht-1.8.4/examples/04.Movement/Makefile   2019-09-07 14:47:39.587124104 +0200
  149. +@@ -5,7 +5,7 @@
  150. + Sources = main.cpp
  151. +
  152. + # general compiler settings
  153. +-CPPFLAGS = -I../../include -I/usr/X11R6/include
  154. ++CPPFLAGS = -I../../include -I/usr/include
  155. + CXXFLAGS = -O3 -ffast-math
  156. + #CXXFLAGS = -g -Wall
  157. +
  158. +@@ -17,7 +17,7 @@
  159. + endif
  160. +
  161. + # target specific settings
  162. +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
  163. ++all_linux: LDFLAGS = -L/usr/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
  164. + all_linux clean_linux: SYSTEM=Linux
  165. + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
  166. + all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
  167. +diff -ur irrlicht-1.8.4_old/examples/05.UserInterface/Makefile irrlicht-1.8.4/examples/05.UserInterface/Makefile
  168. +--- irrlicht-1.8.4_old/examples/05.UserInterface/Makefile  2012-11-03 19:08:50.000000000 +0100
  169. ++++ irrlicht-1.8.4/examples/05.UserInterface/Makefile  2019-09-07 14:46:57.150654633 +0200
  170. +@@ -5,7 +5,7 @@
  171. + Sources = main.cpp
  172. +
  173. + # general compiler settings
  174. +-CPPFLAGS = -I../../include -I/usr/X11R6/include
  175. ++CPPFLAGS = -I../../include -I/usr/include
  176. + CXXFLAGS = -O3 -ffast-math
  177. + #CXXFLAGS = -g -Wall
  178. +
  179. +@@ -17,7 +17,7 @@
  180. + endif
  181. +
  182. + # target specific settings
  183. +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
  184. ++all_linux: LDFLAGS = -L/usr/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
  185. + all_linux clean_linux: SYSTEM=Linux
  186. + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
  187. + all_win32 clean_win32: SYSTEM=Win32-gcc
  188. +diff -ur irrlicht-1.8.4_old/examples/07.Collision/Makefile irrlicht-1.8.4/examples/07.Collision/Makefile
  189. +--- irrlicht-1.8.4_old/examples/07.Collision/Makefile  2012-11-03 19:08:50.000000000 +0100
  190. ++++ irrlicht-1.8.4/examples/07.Collision/Makefile  2019-09-07 14:47:23.053330805 +0200
  191. +@@ -5,7 +5,7 @@
  192. + Sources = main.cpp
  193. +
  194. + # general compiler settings
  195. +-CPPFLAGS = -I../../include -I/usr/X11R6/include
  196. ++CPPFLAGS = -I../../include -I/usr/include
  197. + CXXFLAGS = -O3 -ffast-math
  198. + #CXXFLAGS = -g -Wall
  199. +
  200. +@@ -17,7 +17,7 @@
  201. + endif
  202. +
  203. + # target specific settings
  204. +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
  205. ++all_linux: LDFLAGS = -L/usr/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
  206. + all_linux clean_linux: SYSTEM=Linux
  207. + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
  208. + all_win32 clean_win32: SYSTEM=Win32-gcc
  209. +diff -ur irrlicht-1.8.4_old/examples/10.Shaders/Makefile irrlicht-1.8.4/examples/10.Shaders/Makefile
  210. +--- irrlicht-1.8.4_old/examples/10.Shaders/Makefile    2012-11-03 19:08:52.000000000 +0100
  211. ++++ irrlicht-1.8.4/examples/10.Shaders/Makefile    2019-09-07 14:46:19.013131417 +0200
  212. +@@ -5,7 +5,7 @@
  213. + Sources = main.cpp
  214. +
  215. + # general compiler settings
  216. +-CPPFLAGS = -I../../include -I/usr/X11R6/include
  217. ++CPPFLAGS = -I../../include -I/usr/include
  218. + CXXFLAGS = -O3 -ffast-math
  219. + #CXXFLAGS = -g -Wall
  220. +
  221. +@@ -17,7 +17,7 @@
  222. + endif
  223. +
  224. + # target specific settings
  225. +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
  226. ++all_linux: LDFLAGS = -L/usr/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
  227. + all_linux clean_linux: SYSTEM=Linux
  228. + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
  229. + all_win32 clean_win32: SYSTEM=Win32-gcc
  230. +diff -ur irrlicht-1.8.4_old/examples/11.PerPixelLighting/Makefile irrlicht-1.8.4/examples/11.PerPixelLighting/Makefile
  231. +--- irrlicht-1.8.4_old/examples/11.PerPixelLighting/Makefile   2012-11-03 19:08:52.000000000 +0100
  232. ++++ irrlicht-1.8.4/examples/11.PerPixelLighting/Makefile   2019-09-07 14:47:31.480225454 +0200
  233. +@@ -5,7 +5,7 @@
  234. + Sources = main.cpp
  235. +
  236. + # general compiler settings
  237. +-CPPFLAGS = -I../../include -I/usr/X11R6/include
  238. ++CPPFLAGS = -I../../include -I/usr/include
  239. + CXXFLAGS = -O3 -ffast-math
  240. + #CXXFLAGS = -g -Wall
  241. +
  242. +@@ -17,7 +17,7 @@
  243. + endif
  244. +
  245. + # target specific settings
  246. +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
  247. ++all_linux: LDFLAGS = -L/usr/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
  248. + all_linux clean_linux: SYSTEM=Linux
  249. + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
  250. + all_win32 clean_win32: SYSTEM=Win32-gcc
  251. +diff -ur irrlicht-1.8.4_old/examples/19.MouseAndJoystick/Makefile irrlicht-1.8.4/examples/19.MouseAndJoystick/Makefile
  252. +--- irrlicht-1.8.4_old/examples/19.MouseAndJoystick/Makefile   2012-11-03 19:08:48.000000000 +0100
  253. ++++ irrlicht-1.8.4/examples/19.MouseAndJoystick/Makefile   2019-09-07 14:47:07.506525167 +0200
  254. +@@ -5,7 +5,7 @@
  255. + Sources = main.cpp
  256. +
  257. + # general compiler settings
  258. +-CPPFLAGS = -I../../include -I/usr/X11R6/include
  259. ++CPPFLAGS = -I../../include -I/usr/include
  260. + #CXXFLAGS = -O3 -ffast-math
  261. + CXXFLAGS = -g -Wall
  262. +
  263. +@@ -17,7 +17,7 @@
  264. + endif
  265. +
  266. + # target specific settings
  267. +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
  268. ++all_linux: LDFLAGS = -L/usr/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
  269. + all_linux clean_linux: SYSTEM=Linux
  270. + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
  271. + all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
  272. +diff -ur irrlicht-1.8.4_old/examples/21.Quake3Explorer/Makefile irrlicht-1.8.4/examples/21.Quake3Explorer/Makefile
  273. +--- irrlicht-1.8.4_old/examples/21.Quake3Explorer/Makefile 2012-11-03 19:08:52.000000000 +0100
  274. ++++ irrlicht-1.8.4/examples/21.Quake3Explorer/Makefile 2019-09-07 14:47:48.787009089 +0200
  275. +@@ -5,7 +5,7 @@
  276. + Sources = main.cpp sound.cpp q3factory.cpp
  277. +
  278. + # general compiler settings
  279. +-CPPFLAGS = -I../../include -I/usr/X11R6/include
  280. ++CPPFLAGS = -I../../include -I/usr/include
  281. + #CXXFLAGS = -O3 -ffast-math
  282. + CXXFLAGS = -g -Wall
  283. +
  284. +@@ -17,7 +17,7 @@
  285. + endif
  286. +
  287. + # target specific settings
  288. +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
  289. ++all_linux: LDFLAGS = -L/usr/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
  290. + all_linux clean_linux: SYSTEM=Linux
  291. + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
  292. + all_win32 clean_win32: SYSTEM=Win32-gcc
  293. +diff -ur irrlicht-1.8.4_old/examples/23.SMeshHandling/Makefile irrlicht-1.8.4/examples/23.SMeshHandling/Makefile
  294. +--- irrlicht-1.8.4_old/examples/23.SMeshHandling/Makefile  2012-11-03 19:08:50.000000000 +0100
  295. ++++ irrlicht-1.8.4/examples/23.SMeshHandling/Makefile  2019-09-07 14:46:38.223891250 +0200
  296. +@@ -5,7 +5,7 @@
  297. + Sources = main.cpp
  298. +
  299. + # general compiler settings
  300. +-CPPFLAGS = -I../../include -I/usr/X11R6/include
  301. ++CPPFLAGS = -I../../include -I/usr/include
  302. + CXXFLAGS = -O3 -ffast-math
  303. + #CXXFLAGS = -g -Wall
  304. +
  305. +@@ -17,7 +17,7 @@
  306. + endif
  307. +
  308. + # target specific settings
  309. +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
  310. ++all_linux: LDFLAGS = -L/usr/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
  311. + all_linux clean_linux: SYSTEM=Linux
  312. + all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
  313. + all_win32 clean_win32: SYSTEM=Win32-gcc
  314. +diff -ur irrlicht-1.8.4_old/examples/24.CursorControl/Makefile irrlicht-1.8.4/examples/24.CursorControl/Makefile
  315. +--- irrlicht-1.8.4_old/examples/24.CursorControl/Makefile  2012-11-03 19:08:52.000000000 +0100
  316. ++++ irrlicht-1.8.4/examples/24.CursorControl/Makefile  2019-09-07 14:46:29.253003401 +0200
  317. +@@ -24,7 +24,7 @@
  318. + #no changes necessary below this line
  319. + ####
  320. +
  321. +-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)
  322. ++CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/include $(USERCPPFLAGS)
  323. + CXXFLAGS = $(USERCXXFLAGS)
  324. + LDFLAGS = $(USERLDFLAGS)
  325. +
  326. +@@ -33,7 +33,7 @@
  327. +
  328. + # target specific settings
  329. + all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
  330. +-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor
  331. ++all_linux: LDFLAGS += -L/usr/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor
  332. + all_linux clean_linux: SYSTEM=Linux
  333. + all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
  334. + all_win32 clean_win32 static_win32: SUF=.exe
  335. +diff -ur irrlicht-1.8.4_old/source/Irrlicht/Irrlicht-gcc.cbp irrlicht-1.8.4/source/Irrlicht/Irrlicht-gcc.cbp
  336. +--- irrlicht-1.8.4_old/source/Irrlicht/Irrlicht-gcc.cbp    2016-05-26 12:09:36.000000000 +0200
  337. ++++ irrlicht-1.8.4/source/Irrlicht/Irrlicht-gcc.cbp    2019-09-07 14:45:48.420513878 +0200
  338. +@@ -288,7 +288,7 @@
  339. +               <Linker>
  340. +                   <Add library="GL" />
  341. +                   <Add library="Xxf86vm" />
  342. +-                  <Add directory="/usr/X11R6/lib" />
  343. ++                  <Add directory="/usr/lib" />
  344. +                   <Add directory="/usr/local/lib" />
  345. +               </Linker>
  346. +           </Target>
  347. +@@ -315,7 +315,7 @@
  348. +               <Linker>
  349. +                   <Add library="GL" />
  350. +                   <Add library="Xxf86vm" />
  351. +-                  <Add directory="/usr/X11R6/lib" />
  352. ++                  <Add directory="/usr/lib" />
  353. +                   <Add directory="/usr/local/lib" />
  354. +               </Linker>
  355. +           </Target>
  356. +@@ -343,7 +343,7 @@
  357. +               <Linker>
  358. +                   <Add library="GL" />
  359. +                   <Add library="Xxf86vm" />
  360. +-                  <Add directory="/usr/X11R6/lib" />
  361. ++                  <Add directory="/usr/lib" />
  362. +                   <Add directory="/usr/local/lib" />
  363. +               </Linker>
  364. +           </Target>
  365. +@@ -372,7 +372,7 @@
  366. +               <Linker>
  367. +                   <Add library="GL" />
  368. +                   <Add library="Xxf86vm" />
  369. +-                  <Add directory="/usr/X11R6/lib" />
  370. ++                  <Add directory="/usr/lib" />
  371. +                   <Add directory="/usr/local/lib" />
  372. +               </Linker>
  373. +           </Target>
  374. +@@ -398,7 +398,7 @@
  375. +               <Linker>
  376. +                   <Add library="GL" />
  377. +                   <Add library="Xxf86vm" />
  378. +-                  <Add directory="/usr/X11R6/lib" />
  379. ++                  <Add directory="/usr/lib" />
  380. +                   <Add directory="/usr/local/lib" />
  381. +               </Linker>
  382. +           </Target>
  383. +@@ -425,7 +425,7 @@
  384. +               <Linker>
  385. +                   <Add library="GL" />
  386. +                   <Add library="Xxf86vm" />
  387. +-                  <Add directory="/usr/X11R6/lib" />
  388. ++                  <Add directory="/usr/lib" />
  389. +                   <Add directory="/usr/local/lib" />
  390. +               </Linker>
  391. +           </Target>
  392. +diff -ur irrlicht-1.8.4_old/source/Irrlicht/Makefile irrlicht-1.8.4/source/Irrlicht/Makefile
  393. +--- irrlicht-1.8.4_old/source/Irrlicht/Makefile    2019-09-07 22:39:16.535363569 +0200
  394. ++++ irrlicht-1.8.4/source/Irrlicht/Makefile    2019-09-07 14:45:25.151804777 +0200
  395. +@@ -88,16 +88,16 @@
  396. + LIB_PATH = ../../lib/$(SYSTEM)
  397. + INSTALL_DIR = /usr/local/lib
  398. + sharedlib install: SHARED_LIB = libIrrlicht.so
  399. +-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
  400. +-staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
  401. ++sharedlib: LDFLAGS += -L/usr/lib$(LIBSELECT) -lGL -lXxf86vm
  402. ++staticlib sharedlib: CXXINCS += -I/usr/include
  403. +
  404. + #OSX specific options
  405. + staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX
  406. + staticlib_osx sharedlib_osx: IRROTHEROBJ += MacOSX/CIrrDeviceMacOSX.o MacOSX/OSXClipboard.o MacOSX/AppDelegate.o
  407. +-staticlib_osx sharedlib_osx: CXXINCS += -IMacOSX -I/usr/X11R6/include
  408. ++staticlib_osx sharedlib_osx: CXXINCS += -IMacOSX -I/usr/include
  409. + sharedlib_osx install_osx: SHARED_LIB = libIrrlicht.dylib
  410. + staticlib_osx sharedlib_osx: LDFLAGS += --no-export-all-symbols --add-stdcall-alias
  411. +-sharedlib_osx: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
  412. ++sharedlib_osx: LDFLAGS += -L/usr/lib$(LIBSELECT) -lGL -lXxf86vm
  413. + # for non-X11 app
  414. + #sharedlib_osx: LDFLAGS += -framework cocoa -framework carbon -framework opengl -framework IOKit
  415. +
  416. diff --git a/package/irrlicht/0003-xorg-path2.patch b/package/irrlicht/0003-xorg-path2.patch
  417. new file mode 100644
  418. index 0000000000..8d471529ac
  419. --- /dev/null
  420. +++ b/package/irrlicht/0003-xorg-path2.patch
  421. @@ -0,0 +1,12 @@
  422. +diff -ur irrlicht-1.8.4_3/source/Irrlicht/Makefile irrlicht-1.8.4_4/source/Irrlicht/Makefile
  423. +--- irrlicht-1.8.4_3/source/Irrlicht/Makefile  2019-09-07 22:45:21.052806474 +0200
  424. ++++ irrlicht-1.8.4_4/source/Irrlicht/Makefile  2019-09-07 22:53:30.870682908 +0200
  425. +@@ -89,7 +89,7 @@
  426. + INSTALL_DIR = /usr/local/lib
  427. + sharedlib install: SHARED_LIB = libIrrlicht.so
  428. + sharedlib: LDFLAGS += -L/usr/lib$(LIBSELECT) -lGL -lXxf86vm
  429. +-staticlib sharedlib: CXXINCS += -I/usr/include
  430. ++#staticlib sharedlib: CXXINCS += -I/usr/include
  431. +
  432. + #OSX specific options
  433. + staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX
  434. diff --git a/package/libgpg-error/0001-namespace.patch b/package/libgpg-error/0001-namespace.patch
  435. new file mode 100644
  436. index 0000000000..d0c294abcc
  437. --- /dev/null
  438. +++ b/package/libgpg-error/0001-namespace.patch
  439. @@ -0,0 +1,51 @@
  440. +diff -ur libgpg-error-1.36_orig/src/Makefile.am libgpg-error-1.36/src/Makefile.am
  441. +--- libgpg-error-1.36_orig/src/Makefile.am 2018-12-12 09:14:31.000000000 +0100
  442. ++++ libgpg-error-1.36/src/Makefile.am  2019-09-06 22:44:53.318301844 +0200
  443. +@@ -293,7 +293,7 @@
  444. +
  445. + errnos-sym.h: Makefile mkstrtable.awk errnos.in
  446. +   $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
  447. +-      -v prefix=GPG_ERR_ -v namespace=errnos_ \
  448. ++      -v prefix=GPG_ERR_ -v varerrno=errnos_ \
  449. +       $(srcdir)/errnos.in >$@
  450. +
  451. +
  452. +diff -ur libgpg-error-1.36_orig/src/mkstrtable.awk libgpg-error-1.36/src/mkstrtable.awk
  453. +--- libgpg-error-1.36_orig/src/mkstrtable.awk  2013-03-15 20:24:25.000000000 +0100
  454. ++++ libgpg-error-1.36/src/mkstrtable.awk   2019-09-06 22:44:53.319301831 +0200
  455. +@@ -77,7 +77,7 @@
  456. + #
  457. + # The variable prefix can be used to prepend a string to each message.
  458. + #
  459. +-# The variable namespace can be used to prepend a string to each
  460. ++# The variable varerrno can be used to prepend a string to each
  461. + # variable and macro name.
  462. +
  463. + BEGIN {
  464. +@@ -102,7 +102,7 @@
  465. +       print "/* The purpose of this complex string table is to produce";
  466. +       print "   optimal code with a minimum of relocations.  */";
  467. +       print "";
  468. +-      print "static const char " namespace "msgstr[] = ";
  469. ++      print "static const char " varerrno "msgstr[] = ";
  470. +       header = 0;
  471. +     }
  472. +   else
  473. +@@ -150,7 +150,7 @@
  474. +   else
  475. +     print "  gettext_noop (\"" last_msgstr "\");";
  476. +   print "";
  477. +-  print "static const int " namespace "msgidx[] =";
  478. ++  print "static const int " varerrno "msgidx[] =";
  479. +   print "  {";
  480. +   for (i = 0; i < coded_msgs; i++)
  481. +     print "    " pos[i] ",";
  482. +@@ -158,7 +158,7 @@
  483. +   print "  };";
  484. +   print "";
  485. +   print "static GPG_ERR_INLINE int";
  486. +-  print namespace "msgidxof (int code)";
  487. ++  print varerrno "msgidxof (int code)";
  488. +   print "{";
  489. +   print "  return (0 ? 0";
  490. +
  491. diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk
  492. index 95f5988770..a8c0367f6d 100644
  493. --- a/package/libgpg-error/libgpg-error.mk
  494. +++ b/package/libgpg-error/libgpg-error.mk
  495. @@ -15,4 +15,6 @@ LIBGPG_ERROR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
  496.  LIBGPG_ERROR_CONF_OPTS = --disable-tests \
  497.         --host=$(BR2_PACKAGE_LIBGPG_ERROR_SYSCFG)
  498.  
  499. +LIBGPG_ERROR_AUTORECONF = YES
  500. +
  501.  $(eval $(autotools-package))
  502. diff --git a/package/llvm/Config.in b/package/llvm/Config.in
  503. index 83e94660eb..a632313ab8 100644
  504. --- a/package/llvm/Config.in
  505. +++ b/package/llvm/Config.in
  506. @@ -4,13 +4,15 @@ config BR2_PACKAGE_LLVM_ARCH_SUPPORTS
  507.     default y if BR2_x86_64
  508.     default y if BR2_aarch64
  509.     default y if BR2_arm || BR2_armeb
  510. +   default y if BR2_mipsel
  511.  
  512.  config BR2_PACKAGE_LLVM_TARGET_ARCH
  513.     string
  514.     default "AArch64" if BR2_aarch64
  515.     default "ARM" if BR2_arm || BR2_armeb
  516.     default "X86" if BR2_i386 || BR2_x86_64
  517. -
  518. +   default "Mips" if BR2_mipsel
  519. +  
  520.  config BR2_PACKAGE_LLVM
  521.     bool "llvm"
  522.     depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS
  523. diff --git a/package/luajit/Config.in b/package/luajit/Config.in
  524. index 88c5bcbf28..2554bdf2f0 100644
  525. --- a/package/luajit/Config.in
  526. +++ b/package/luajit/Config.in
  527. @@ -3,11 +3,11 @@ config BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
  528.     default y if BR2_i386 || \
  529.         (BR2_x86_64 && BR2_HOSTARCH='x86_64') || \
  530.         BR2_powerpc || BR2_arm || BR2_armeb || \
  531. -       ((BR2_mips || BR2_mipsel) && !BR2_MIPS_SOFT_FLOAT && \
  532. +       ((BR2_mips || BR2_mipsel) && \
  533.         !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6)
  534.     # -m32 flag is used for 32bit builds and host-luajit has
  535.     # limited architecture support
  536. -   depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
  537. +#  depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
  538.  
  539.  config BR2_PACKAGE_LUAJIT
  540.     bool "luajit"
  541. @@ -19,7 +19,7 @@ config BR2_PACKAGE_LUAJIT
  542.     # binaries, so check if that option is supported. See
  543.     # luajit.mk for details.
  544.     select BR2_PACKAGE_HAS_LUAINTERPRETER
  545. -   select BR2_HOSTARCH_NEEDS_IA32_COMPILER if !BR2_ARCH_IS_64
  546. +#  select BR2_HOSTARCH_NEEDS_IA32_COMPILER if !BR2_ARCH_IS_64
  547.     help
  548.       LuaJIT implements the full set of language features defined
  549.       by Lua 5.1. The virtual machine (VM) is API- and
  550. diff --git a/package/luajit/luajit.hash b/package/luajit/luajit.hash
  551. index 7e2d87ebb2..4ed0d080c2 100644
  552. --- a/package/luajit/luajit.hash
  553. +++ b/package/luajit/luajit.hash
  554. @@ -1,5 +1,5 @@
  555.  # Hashes from: http://luajit.org/download.html
  556. -md5 48353202cbcacab84ee41a5a70ea0a2c    LuaJIT-2.0.5.tar.gz
  557. +md5 eae40bc29d06ee5e3078f9444fcea39b    LuaJIT-2.1.0-beta3.tar.gz
  558.  
  559.  # Locally calculated
  560.  sha256 accb335aa3102f80d31caa2c2508fbcb795314106493519a367f13a87d0e87de  COPYRIGHT
  561. diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
  562. index 5b08a42d98..0b8001e4c0 100644
  563. --- a/package/luajit/luajit.mk
  564. +++ b/package/luajit/luajit.mk
  565. @@ -4,7 +4,7 @@
  566.  #
  567.  ################################################################################
  568.  
  569. -LUAJIT_VERSION = 2.0.5
  570. +LUAJIT_VERSION = 2.1.0-beta3
  571.  LUAJIT_SOURCE = LuaJIT-$(LUAJIT_VERSION).tar.gz
  572.  LUAJIT_SITE = http://luajit.org/download
  573.  LUAJIT_LICENSE = MIT
  574. @@ -35,6 +35,7 @@ ifeq ($(BR2_ARCH_IS_64),y)
  575.  LUAJIT_HOST_CC = $(HOSTCC)
  576.  else
  577.  LUAJIT_HOST_CC = $(HOSTCC) -m32
  578. +#LUAJIT_HOST_CC = arm-linux-gnueabihf-gcc-9
  579.  endif
  580.  
  581.  # We unfortunately can't use TARGET_CONFIGURE_OPTS, because the luajit
  582. diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
  583. index 70067058e6..30aa4eaebe 100644
  584. --- a/package/mesa3d/Config.in
  585. +++ b/package/mesa3d/Config.in
  586. @@ -120,7 +120,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU
  587.  
  588.  config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600
  589.     bool "Gallium Radeon R600 driver"
  590. -   depends on BR2_i386 || BR2_x86_64
  591. +   depends on BR2_i386 || BR2_x86_64 || BR2_mipsel
  592.     depends on !BR2_PACKAGE_MESA3D_LLVM || \
  593.         (BR2_PACKAGE_MESA3D_LLVM && (BR2_TOOLCHAIN_USES_UCLIBC || \
  594.             BR2_TOOLCHAIN_USES_GLIBC)) # elfutils
  595. @@ -142,7 +142,7 @@ comment "R600 driver needs a uClibc or glibc toolchain when llvm is enabled"
  596.  config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI
  597.     bool "Gallium Radeon SI driver"
  598.     depends on BR2_USE_MMU # libdrm
  599. -   depends on BR2_i386 || BR2_x86_64
  600. +   depends on BR2_i386 || BR2_x86_64 || BR2_mipsel
  601.     depends on BR2_PACKAGE_MESA3D_LLVM
  602.     depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils
  603.     select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
  604. diff --git a/package/openjdk-bin/openjdk-bin.hash b/package/openjdk-bin/openjdk-bin.hash
  605. index dc0476ca2d..e5d06d289d 100644
  606. --- a/package/openjdk-bin/openjdk-bin.hash
  607. +++ b/package/openjdk-bin/openjdk-bin.hash
  608. @@ -1,5 +1,5 @@
  609.  # From https://github.com/AdoptOpenJDK/openjdk12-binaries/releases
  610. -sha256  1202f536984c28d68681d51207a84b6c76e5998579132d3fe1b8085aa6a5f21e   OpenJDK12U-jdk_x64_linux_hotspot_12.0.2_10.tar.gz
  611. +sha256  1cff1974d9f28d5fbea946af23be2eef60e128a476e80779f8c010a8176e9095   OpenJDK12U-jdk_aarch64_linux_hotspot_2019-08-21-12-18.tar.gz
  612.  
  613.  # Locally calculated
  614.  sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726    legal/java.prefs/LICENSE
  615. diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk
  616. index 80b69b7a0e..8af183568d 100644
  617. --- a/package/openjdk-bin/openjdk-bin.mk
  618. +++ b/package/openjdk-bin/openjdk-bin.mk
  619. @@ -4,11 +4,12 @@
  620.  #
  621.  ################################################################################
  622.  
  623. -HOST_OPENJDK_BIN_VERSION_MAJOR = 12.0.2
  624. -HOST_OPENJDK_BIN_VERSION_MINOR = 10
  625. -HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR)
  626. -HOST_OPENJDK_BIN_SOURCE = OpenJDK12U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz
  627. -HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR)
  628. +#HOST_OPENJDK_BIN_VERSION_MAJOR = 12.0.2
  629. +#HOST_OPENJDK_BIN_VERSION_MINOR = 10
  630. +#HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR)
  631. +HOST_OPENJDK_BIN_SOURCE = OpenJDK12U-jdk_aarch64_linux_hotspot_2019-08-21-12-18.tar.gz
  632. +HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk12u-2019-08-21-12-18/
  633. +
  634.  HOST_OPENJDK_BIN_LICENSE = GPL-2.0+ with exception
  635.  HOST_OPENJDK_BIN_LICENSE_FILES = legal/java.prefs/LICENSE legal/java.prefs/ASSEMBLY_EXCEPTION
  636.  
  637. diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in
  638. index 61294ec49f..62645a486e 100644
  639. --- a/package/openjdk/Config.in
  640. +++ b/package/openjdk/Config.in
  641. @@ -1,6 +1,7 @@
  642.  config BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS
  643.     bool
  644.     default y if BR2_HOSTARCH = "x86_64"
  645. +   default y if BR2_HOSTARCH = "aarch64"
  646.  
  647.  # Taken from make/autoconf/platform.m4
  648.  config BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS
  649. @@ -12,12 +13,13 @@ config BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS
  650.     default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
  651.     default y if BR2_sh
  652.     default y if BR2_sparc || BR2_sparc64
  653. +   default y if BR2_mipsel
  654.  
  655.  config BR2_PACKAGE_OPENJDK
  656.     bool "openjdk"
  657.     depends on BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS
  658.     depends on BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS
  659. -   depends on !BR2_SOFT_FLOAT
  660. +#  depends on !BR2_SOFT_FLOAT
  661.     depends on !BR2_STATIC_LIBS # glibc
  662.     depends on BR2_INSTALL_LIBSTDCPP # cups
  663.     depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, cups, libusb
  664. @@ -91,8 +93,8 @@ comment "openjdk needs glibc, and a toolchain w/ wchar, dynamic library, threads
  665.     depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \
  666.         !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC
  667.  
  668. -comment "openjdk does not support soft float configurations"
  669. -   depends on BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS
  670. -   depends on BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS
  671. -   depends on BR2_USE_MMU
  672. -   depends on BR2_SOFT_FLOAT
  673. +#comment "openjdk does not support soft float configurations"
  674. +#  depends on BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS
  675. +#  depends on BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS
  676. +#  depends on BR2_USE_MMU
  677. +#  depends on BR2_SOFT_FLOAT
  678. diff --git a/package/p7zip/0001-long.patch b/package/p7zip/0001-long.patch
  679. new file mode 100644
  680. index 0000000000..4dcfc6ed37
  681. --- /dev/null
  682. +++ b/package/p7zip/0001-long.patch
  683. @@ -0,0 +1,24 @@
  684. +diff -ur p7zip-16.02_old/CPP/Windows/ErrorMsg.cpp p7zip-16.02_new/CPP/Windows/ErrorMsg.cpp
  685. +--- p7zip-16.02_old/CPP/Windows/ErrorMsg.cpp   2015-01-18 19:20:28.000000000 +0100
  686. ++++ p7zip-16.02_new/CPP/Windows/ErrorMsg.cpp   2019-09-07 11:03:34.142215296 +0200
  687. +@@ -15,13 +15,13 @@
  688. +
  689. +   switch(errorCode) {
  690. +     case ERROR_NO_MORE_FILES   : txt = "No more files"; break ;
  691. +-    case E_NOTIMPL             : txt = "E_NOTIMPL"; break ;
  692. +-    case E_NOINTERFACE         : txt = "E_NOINTERFACE"; break ;
  693. +-    case E_ABORT               : txt = "E_ABORT"; break ;
  694. +-    case E_FAIL                : txt = "E_FAIL"; break ;
  695. +-    case STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ;
  696. +-    case E_OUTOFMEMORY         : txt = "E_OUTOFMEMORY"; break ;
  697. +-    case E_INVALIDARG          : txt = "E_INVALIDARG"; break ;
  698. ++    case (DWORD)E_NOTIMPL             : txt = "E_NOTIMPL"; break ;
  699. ++    case (DWORD)E_NOINTERFACE         : txt = "E_NOINTERFACE"; break ;
  700. ++    case (DWORD)E_ABORT               : txt = "E_ABORT"; break ;
  701. ++    case (DWORD)E_FAIL                : txt = "E_FAIL"; break ;
  702. ++    case (DWORD)STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ;
  703. ++    case (DWORD)E_OUTOFMEMORY         : txt = "E_OUTOFMEMORY"; break ;
  704. ++    case (DWORD)E_INVALIDARG          : txt = "E_INVALIDARG"; break ;
  705. +     case ERROR_DIRECTORY          : txt = "Error Directory"; break ;
  706. +     default:
  707. +       txt = strerror(errorCode);
  708. diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
  709. index e566603d29..f6fb9a449b 100644
  710. --- a/package/pixman/pixman.mk
  711. +++ b/package/pixman/pixman.mk
  712. @@ -43,6 +43,8 @@ ifneq ($(BR2_iwmmxt),y)
  713.  PIXMAN_CONF_OPTS += --disable-arm-iwmmxt
  714.  endif
  715.  
  716. +PIXMAN_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -g"
  717. +
  718.  # toolchain gets confused about TLS access through GOT (PIC), so disable TLS
  719.  # movhi    r4, %got_hiadj(%tls_ldo(fast_path_cache))
  720.  # {standard input}:172: Error: bad expression
  721. diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk
  722. index 1c6912accf..2f900c13b5 100644
  723. --- a/package/sdl_mixer/sdl_mixer.mk
  724. +++ b/package/sdl_mixer/sdl_mixer.mk
  725. @@ -21,7 +21,6 @@ SDL_MIXER_CONF_OPTS = \
  726.     --without-x \
  727.     --with-sdl-prefix=$(STAGING_DIR)/usr \
  728.     --disable-music-midi \
  729. -   --disable-music-mod \
  730.     --disable-music-mp3 \
  731.     --disable-music-flac # configure script fails when cross compiling
  732.  
  733. diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
  734. index a33cb25076..be58161513 100644
  735. --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
  736. +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
  737. @@ -49,7 +49,7 @@ XSERVER_XORG_SERVER_CONF_OPTS = \
  738.     --disable-dmx \
  739.     --disable-unit-tests \
  740.     --with-builder-addr=buildroot@buildroot.org \
  741. -   CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1 -O2" \
  742. +   CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1 -Ofast" \
  743.     --with-fontrootdir=/usr/share/fonts/X11/ \
  744.     --$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB),en,dis)able-xvfb
  745.  
  746. diff --git a/toolchain/Config.in b/toolchain/Config.in
  747. index bd2c547ff1..cfa77f1c3e 100644
  748. --- a/toolchain/Config.in
  749. +++ b/toolchain/Config.in
  750. @@ -530,10 +530,15 @@ config BR2_TOOLCHAIN_GCC_AT_LEAST_9
  751.     bool
  752.     select BR2_TOOLCHAIN_GCC_AT_LEAST_8
  753.  
  754. +config BR2_TOOLCHAIN_GCC_AT_LEAST_10
  755. +   bool
  756. +   select BR2_TOOLCHAIN_GCC_AT_LEAST_9
  757. +
  758.  # This order guarantees that the highest version is set, as kconfig
  759.  # stops affecting a value on the first matching default.
  760.  config BR2_TOOLCHAIN_GCC_AT_LEAST
  761.     string
  762. +   default "10"    if BR2_TOOLCHAIN_GCC_AT_LEAST_10
  763.     default "9" if BR2_TOOLCHAIN_GCC_AT_LEAST_9
  764.     default "8" if BR2_TOOLCHAIN_GCC_AT_LEAST_8
  765.     default "7" if BR2_TOOLCHAIN_GCC_AT_LEAST_7
  766. diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
  767. index 679e727509..12d77c775a 100644
  768. --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
  769. +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
  770. @@ -31,6 +31,10 @@ choice
  771.       Set to the gcc version that is used by your external
  772.       toolchain.
  773.  
  774. +config BR2_TOOLCHAIN_EXTERNAL_GCC_10
  775. +   bool "10.x"
  776. +   select BR2_TOOLCHAIN_GCC_AT_LEAST_10
  777. +
  778.  config BR2_TOOLCHAIN_EXTERNAL_GCC_9
  779.     bool "9.x"
  780.     select BR2_TOOLCHAIN_GCC_AT_LEAST_9
  781. --
  782. 2.23.0
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!