Packman Build Service PMBS

_service:obs_scm:vlc-beta-20220302.94bc262fbe.obscpio/doc/libvlc/QtGL/qtvlcwidget.cpp -> _service:obs_scm:vlc-beta-20220303.491e7440b3.obscpio/doc/libvlc/QtGL/qtvlcwidget.cpp Changed

​x
 
@@ -294,7 +294,7 @@
     "void main()\n"
     "{\n"
     "    gl_FragColor = texture2D(texture, texcoord);\n"
-    "};\n";
+    "}\n";
 
 /*
  * Data used to seed our vertex array and element array buffers:
​

_service:obs_scm:vlc-beta-20220302.94bc262fbe.obscpio/extras/ci/gitlab-ci.yml -> _service:obs_scm:vlc-beta-20220303.491e7440b3.obscpio/extras/ci/gitlab-ci.yml Changed

 
@@ -118,8 +118,8 @@
 .base-template:
     stage: build
     rules:
-        - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-        - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "master@videolan/vlc"'
+        - if: $CI_MERGE_REQUEST_IID
+        - if: '$CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_PATH == "videolan/vlc"'
     artifacts:
         paths:
             - contrib/vlc-contrib-${TRIPLET}-*.tar.bz2
​

_service:obs_scm:vlc-beta-20220302.94bc262fbe.obscpio/modules/video_output/libplacebo/display.c -> _service:obs_scm:vlc-beta-20220303.491e7440b3.obscpio/modules/video_output/libplacebo/display.c Changed

@@ -231,6 +231,12 @@
         return; // Probably benign error, ignore it
     }
 
+#if PL_API_VER >= 199
+    bool need_vflip = false;
+#else
+    bool need_vflip = frame.flipped;
+#endif
+
     struct pl_image img = {
         .num_planes = pic->i_planes,
         .color      = vlc_placebo_ColorSpace(vd->fmt),
@@ -276,7 +282,7 @@
     vout_display_cfg_t cfg = *vd->cfg;
     cfg.display.width = frame.fbo->params.w;
     cfg.display.height = frame.fbo->params.h;
-    if (frame.flipped) {
+    if (need_vflip) {
         switch (cfg.align.vertical) {
         case VLC_VIDEO_ALIGN_TOP: cfg.align.vertical = VLC_VIDEO_ALIGN_BOTTOM; break;
         case VLC_VIDEO_ALIGN_BOTTOM: cfg.align.vertical = VLC_VIDEO_ALIGN_TOP; break;
@@ -284,7 +290,7 @@
         }
     }
     vout_display_PlacePicture(&place, vd->fmt, &cfg);
-    if (frame.flipped) {
+    if (need_vflip) {
         place.y = frame.fbo->params.h - place.y;
         place.height = -place.height;
     }
@@ -378,7 +384,7 @@
                 assert(!"Failed processing the subpicture_t into pl_plane_data!?");
 
             struct pl_overlay *overlay = &sys->overlays[i];
-            int ysign = frame.flipped ? (-1) : 1;
+            int ysign = need_vflip ? (-1) : 1;
             *overlay = (struct pl_overlay) {
                 .rect = {
                     .x0 = place.x + r->i_x,

 
@@ -231,6 +231,12 @@
         return; // Probably benign error, ignore it
     }
 
+#if PL_API_VER >= 199
+    bool need_vflip = false;
+#else
+    bool need_vflip = frame.flipped;
+#endif
+
     struct pl_image img = {
         .num_planes = pic->i_planes,
         .color      = vlc_placebo_ColorSpace(vd->fmt),
@@ -276,7 +282,7 @@
     vout_display_cfg_t cfg = *vd->cfg;
     cfg.display.width = frame.fbo->params.w;
     cfg.display.height = frame.fbo->params.h;
-    if (frame.flipped) {
+    if (need_vflip) {
         switch (cfg.align.vertical) {
         case VLC_VIDEO_ALIGN_TOP: cfg.align.vertical = VLC_VIDEO_ALIGN_BOTTOM; break;
         case VLC_VIDEO_ALIGN_BOTTOM: cfg.align.vertical = VLC_VIDEO_ALIGN_TOP; break;
@@ -284,7 +290,7 @@
         }
     }
     vout_display_PlacePicture(&place, vd->fmt, &cfg);
-    if (frame.flipped) {
+    if (need_vflip) {
         place.y = frame.fbo->params.h - place.y;
         place.height = -place.height;
     }
@@ -378,7 +384,7 @@
                 assert(!"Failed processing the subpicture_t into pl_plane_data!?");
 
             struct pl_overlay *overlay = &sys->overlays[i];
-            int ysign = frame.flipped ? (-1) : 1;
+            int ysign = need_vflip ? (-1) : 1;
             *overlay = (struct pl_overlay) {
                 .rect = {
                     .x0 = place.x + r->i_x,
​

_service:obs_scm:vlc-beta.obsinfo Changed

 
@@ -1,5 +1,5 @@
 name: vlc-beta
-version: 20220302.94bc262fbe
-mtime: 1646252221
-commit: 94bc262fbe361dd4da5a4263b52e7ecdafe7d44e
+version: 20220303.491e7440b3
+mtime: 1646326625
+commit: 491e7440b3f9b4b5f278f5b379c04412863c8ec7
 
​

Changes of Revision 201