Fix build issues on older ffmpeg (disable unused vulkan encoder for now), fix incorrect wayland protocol fileHEADmaster

3 files changed, 5 insertions, 6 deletions

diff --git a/protocol/xdg-output-unstable-v1.xml b/protocol/xdg-output-unstable-v1.xml
index a7306e4..5d536aa 100644
--- a/protocol/xdg-output-unstable-v1.xml
+++ b/protocol/xdg-output-unstable-v1.xml
@@ -151,7 +151,7 @@
 	   summary="height in global compositor space"/>
     </event>
 
-    <event name="done" deprecated-since="3">
+    <event name="done">
       <description summary="all information about the output have been sent">
 	This event is sent after all other properties of an xdg_output
 	have been sent.
diff --git a/src/encoder/video/vulkan.c b/src/encoder/video/vulkan.c
index 7643ada..802934d 100644
--- a/src/encoder/video/vulkan.c
+++ b/src/encoder/video/vulkan.c
@@ -23,7 +23,7 @@ static bool gsr_video_encoder_vulkan_setup_context(gsr_video_encoder_vulkan *sel
     AVDictionary *options = NULL;
     //av_dict_set(&options, "linear_images", "1", 0);
     //av_dict_set(&options, "disable_multiplane", "1", 0);
-
+#if 0
     // TODO: Use correct device
     if(av_hwdevice_ctx_create(&self->device_ctx, AV_HWDEVICE_TYPE_VULKAN, NULL, options, 0) < 0) {
         fprintf(stderr, "gsr error: gsr_video_encoder_vulkan_setup_context: failed to create hardware device context\n");
@@ -57,6 +57,7 @@ static bool gsr_video_encoder_vulkan_setup_context(gsr_video_encoder_vulkan *sel
 
     video_codec_context->hw_frames_ctx = av_buffer_ref(frame_context);
     av_buffer_unref(&frame_context);
+#endif
     return true;
 }
 
@@ -99,7 +100,7 @@ static bool gsr_video_encoder_vulkan_setup_textures(gsr_video_encoder_vulkan *se
     }
 
     while(self->params.egl->glGetError()) {}
-
+#if 0
     AVVkFrame *target_surface_id = (AVVkFrame*)frame->data[0];
     AVVulkanDeviceContext* vv = video_codec_context_get_vulkan_data(video_codec_context);
     const size_t luma_size = frame->width * frame->height;
@@ -224,7 +225,7 @@ static bool gsr_video_encoder_vulkan_setup_textures(gsr_video_encoder_vulkan *se
         fprintf(stderr, "3 gl error: %d\n", self->params.egl->glGetError());
         self->params.egl->glBindTexture(GL_TEXTURE_2D, 0);
      }
-
+#endif
     return true;
 }
 
diff --git a/src/main.cpp b/src/main.cpp
index 73af76d..74b713c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3618,7 +3618,6 @@ int main(int argc, char **argv) {
 
                 if(force_iframe_frame) {
                     video_frame->pict_type = AV_PICTURE_TYPE_I;
-                    video_frame->flags |= AV_FRAME_FLAG_KEY;
                 }
 
                 int ret = avcodec_send_frame(video_codec_context, video_frame);
@@ -3632,7 +3631,6 @@ int main(int argc, char **argv) {
                 if(force_iframe_frame) {
                     force_iframe_frame = false;
                     video_frame->pict_type = AV_PICTURE_TYPE_NONE;
-                    video_frame->flags &= ~AV_FRAME_FLAG_KEY;
                 }
             }