Merge branch 'master' of https://github.com/TASVideos/fceux into coolgirl

4 files changed, 16 insertions, 3 deletions

diff --git a/pipelines/linux_build.sh b/pipelines/linux_build.sh
index 4d8e7474..77922b5e 100755
--- a/pipelines/linux_build.sh
+++ b/pipelines/linux_build.sh
@@ -98,7 +98,7 @@ sudo apt-get --assume-yes  install libavcodec-dev
 sudo apt-get --assume-yes  install libavformat-dev
 sudo apt-get --assume-yes  install libavutil-dev
 sudo apt-get --assume-yes  install libswscale-dev
-sudo apt-get --assume-yes  install libavresample-dev
+sudo apt-get --assume-yes  install libswresample-dev
 
 # Install cppcheck
 echo '****************************************'
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b4d99d3d..1d352470 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -580,7 +580,7 @@ set(SOURCES ${SRC_CORE} ${SRC_DRIVERS_COMMON} ${SRC_DRIVERS_SDL})
 # the FCEUX_BUILD_TIMESTAMP preprocessor definition.
 # Note: with CMake >= 3.8.0, this will respect SOURCE_DATE_EPOCH. For more info,
 #       see <https://reproducible-builds.org/docs/source-date-epoch/>.
-string(TIMESTAMP BUILD_TS "%H:%M:%S  %b %d %Y")
+string(TIMESTAMP BUILD_TS "%H:%M:%S  %b %d %Y" UTC)
 add_definitions( -DFCEUX_BUILD_TIMESTAMP=\"${BUILD_TS}\" )
 
 if (WIN32)
diff --git a/src/drivers/Qt/ConsoleViewerGL.cpp b/src/drivers/Qt/ConsoleViewerGL.cpp
index c473895a..f836dd88 100644
--- a/src/drivers/Qt/ConsoleViewerGL.cpp
+++ b/src/drivers/Qt/ConsoleViewerGL.cpp
@@ -84,6 +84,7 @@ ConsoleViewGL_t::ConsoleViewGL_t(QWidget *parent)
 	setMinimumWidth( 256 );
 	setMinimumHeight( 224 );
 	setFocusPolicy(Qt::StrongFocus);
+	//setAttribute(Qt::WA_OpaquePaintEvent);
 
 	localBufSize = (4 * GL_NES_WIDTH) * (4 * GL_NES_HEIGHT) * sizeof(uint32_t);
 
@@ -272,6 +273,9 @@ void ConsoleViewGL_t::buildTextures(void)
 						GL_BGRA, GL_UNSIGNED_BYTE, 0 );
 	}
 
+	glEnable(GL_BLEND);
+	glBlendFunc(GL_ONE, GL_ONE);
+	//glBlendFunc(GL_ONE_MINUS_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	//printf("Texture Built: %ix%i\n", w, h);
 }
 
@@ -347,7 +351,7 @@ void ConsoleViewGL_t::initializeGL(void)
 	initializeOpenGLFunctions();
 	// Set up the rendering context, load shaders and other resources, etc.:
 	//QOpenGLFunctions *gl = QOpenGLContext::currentContext()->functions();
-	glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+	glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
 
 	chkExtnsGL();
 	 //printf("GL Init!\n");
@@ -666,6 +670,9 @@ void ConsoleViewGL_t::paintGL(void)
 	}
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
+	glEnable(GL_BLEND);
+	glBlendFunc(GL_ONE, GL_ONE);
+	//glBlendFunc(GL_ONE_MINUS_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
 	if ( textureType == GL_TEXTURE_RECTANGLE )
 	{
diff --git a/src/drivers/Qt/HexEditor.cpp b/src/drivers/Qt/HexEditor.cpp
index 0c763382..8335ca7c 100644
--- a/src/drivers/Qt/HexEditor.cpp
+++ b/src/drivers/Qt/HexEditor.cpp
@@ -4205,6 +4205,12 @@ int hexEditorOpenFromDebugger( int mode, int addr )
 
 		win->show();
 	}
+	else
+	{
+		win->activateWindow();
+		win->raise();
+		win->setFocus();
+	}
 
 	win->editor->setMode( mode );
 	win->editor->setAddr( addr );