Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 732343 Details for
Bug 741490
media-libs/libsdl2-2.0.12-r2 build error with VIDEO_CARDS="vc4"
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
consolidated patch.
libsdl2-2.0.16-rpi4.patch (text/plain), 3.25 KB, created by
Ivan S. Titov
on 2021-08-11 23:50:42 UTC
(
hide
)
Description:
consolidated patch.
Filename:
MIME Type:
Creator:
Ivan S. Titov
Created:
2021-08-11 23:50:42 UTC
Size:
3.25 KB
patch
obsolete
>Fix --disable-static. > >Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431 >Bug: https://github.com/gentoo/gentoo/pull/20087 > >--- a/configure.ac 2021-08-06 20:36:54.000000000 +0100 >+++ b/configure.ac 2021-08-10 20:59:58.766664082 +0100 >@@ -1680,7 +1680,7 @@ > RPI_LIBS="-Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lbcm_host" > else > RPI_CFLAGS="-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux" >- RPI_LIBS="-Wl,-rpath,/opt/vc/lib -L/opt/vc/lib -lbcm_host" >+ RPI_LIBS="-Wl,-rpath,/opt/vc/lib -L/opt/vc/lib -lbcm_host -lvchostif" > fi > fi > >@@ -3920,7 +3920,7 @@ > if test -f /lib/w32api/libuuid.a; then > LIBUUID=/lib/w32api/libuuid.a > else >- LIBUUID=-luuid >+ LIBUUID=-Wl,-luuid > fi > EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion $LIBUUID" > BUILD_LDFLAGS="$BUILD_LDFLAGS -Wc,-static-libgcc" >--- a/Makefile.in 2021-08-06 20:36:54.000000000 +0100 >+++ b/Makefile.in 2021-08-10 21:03:44.144233884 +0100 >@@ -154,13 +154,13 @@ > .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d) > > $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS) >- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) >+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) > > $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) >- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir) >+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static > > $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS) >- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir) >+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static > > install: all install-bin install-hdrs install-lib install-data > install-bin: >--- a/src/video/SDL_egl.c >+++ b/src/video/SDL_egl.c >@@ -45,6 +45,10 @@ > > #if SDL_VIDEO_DRIVER_RPI > /* Raspbian places the OpenGL ES/EGL binaries in a non standard path */ >+#include "raspberry/SDL_rpievents_c.h" >+#include "raspberry/SDL_rpiopengles.h" >+#include "raspberry/SDL_rpimouse.h" >+#include "raspberry/SDL_rpivideo.h" > #define DEFAULT_EGL ( vc4 ? "libEGL.so.1" : "libbrcmEGL.so" ) > #define DEFAULT_OGL_ES2 ( vc4 ? "libGLESv2.so.2" : "libbrcmGLESv2.so" ) > #define ALT_EGL "libEGL.so" > >--- a/src/video/raspberry/SDL_rpivideo.h >+++ b/src/video/raspberry/SDL_rpivideo.h >@@ -41,6 +41,12 @@ > DISPMANX_DISPLAY_HANDLE_T dispman_display; > } SDL_DisplayData; > >+ >+typedef struct { >+ DISPMANX_ELEMENT_HANDLE_T element; >+ int width; >+ int height; >+ } EGL_DISPMANX_WINDOW_T; > > typedef struct SDL_WindowData > { > >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 741490
:
659366
|
659560
|
670840
|
730813
|
732340
| 732343 |
752310