Skip to content

Commit

Permalink
Revert "added new flag "newbrcmlibs" for management of switch to rena…
Browse files Browse the repository at this point in the history
…med libbrcm* gles libs RetroPie#2091"

This reverts commit ee41a3f.
  • Loading branch information
psyke83 committed Nov 8, 2017
1 parent 561036b commit 666ed4c
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 15 deletions.
8 changes: 0 additions & 8 deletions scriptmodules/packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -228,14 +228,6 @@ function rp_callModule() {
elif fnExists "install_bin_${md_id}"; then
"install_bin_${md_id}" "$@"
fi
# if the module has the newbrcmlibs it means it is linked against the
# renamed videocore libbrcm* libraries. We record this so we can
# switch library names for SDL in runcommand for software using the
# older names (the new SDL 2.0.6 requires applications to also use
# the new libraries by default)
if isPlatform "rpi" && hasFlag "$md_flags" "newbrcmlibs"; then
touch "$md_inst/RP-NEWBRCMLIBS"
fi
;;
install_bin)
if fnExists "install_bin_${md_id}"; then
Expand Down
7 changes: 0 additions & 7 deletions scriptmodules/supplementary/runcommand/runcommand.sh
Original file line number Diff line number Diff line change
Expand Up @@ -901,13 +901,6 @@ function get_sys_command() {
if [[ -n "$TTY" && "$COMMAND" =~ ^(startx|xinit) ]]; then
COMMAND+=" -- vt$TTY -keeptty"
fi

# if on RPI and there is no RP-NEWBRCMLIBS file present then use old library names for SDL
if [[ "$(sed -n '/^Hardware/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo)" == BCM* && "$COMMAND" =~ $ROOTDIR/[^/]*/[^/]* ]]; then
if [[ ! -f "${BASH_REMATCH[0]}/RP-NEWBRCMLIBS" ]]; then
COMMAND="SDL_VIDEO_EGL_DRIVER=/opt/vc/lib/libEGL.so SDL_VIDEO_GL_DRIVER=/opt/vc/lib/libGLESv2.so $COMMAND"
fi
fi
}

function show_launch() {
Expand Down

0 comments on commit 666ed4c

Please sign in to comment.