Add VERSION for release

No idea what the correct workflow is for these things. In any case, we somehow have to make the github release system to include the correct version in its tarball. I don't think you can provide your own tarballs either, so it has to be in git.
x11_common: get hack for Motif Window Manager out of the way
2013-08-12 00:18:22 +02:00 · 2013-08-11 23:59:18 +02:00 · 2013-08-11 20:09:06 +02:00 · 2013-08-11 20:08:00 +02:00 · 2013-08-09 10:07:23 +02:00 · 2013-08-09 09:44:24 +02:00
5 changed files with 43 additions and 11 deletions
@@ -0,0 +1 @@
+0.1.1
@@ -2384,13 +2384,13 @@ int reinit_video_chain(struct MPContext *mpctx)
                       &(bool){false});
        }
        mpctx->initialized_flags |= INITIALIZED_VO;
-
-        // dynamic allocation only to make stheader.h lighter
-        talloc_free(sh_video->hwdec_info);
-        sh_video->hwdec_info = talloc_zero(sh_video, struct mp_hwdec_info);
-        vo_control(mpctx->video_out, VOCTRL_GET_HWDEC_INFO, sh_video->hwdec_info);
    }

+    // dynamic allocation only to make stheader.h lighter
+    talloc_free(sh_video->hwdec_info);
+    sh_video->hwdec_info = talloc_zero(sh_video, struct mp_hwdec_info);
+    vo_control(mpctx->video_out, VOCTRL_GET_HWDEC_INFO, sh_video->hwdec_info);
+
    vo_update_window_title(mpctx);

    if (stream_control(mpctx->sh_video->gsh->demuxer->stream,
@@ -2,20 +2,41 @@

 export LC_ALL=C

-test "$1" && extra="-$1"
+for ac_option do
+  case "$ac_option" in
+  --extra=*)
+    extra="-$option"
+    ;;
+  --print)
+    print=yes
+    ;;
+  *)
+    echo "Unknown parameter: $option" >&2
+    exit 1
+    ;;
+
+  esac
+done

 # Extract revision number from file used by daily tarball snapshots
 # or from "git describe" output
 git_revision=$(cat snapshot_version 2> /dev/null)
-test $git_revision || test ! -e .git || git_revision=`git rev-parse --short HEAD`
+test $git_revision || test ! -e .git || git_revision=`git describe --match "v[0-9]*" --always --tags --long`
 git_revision=$(expr "$git_revision" : v*'\(.*\)')
 test $git_revision || git_revision=UNKNOWN

 # releases extract the version number from the VERSION file
 version=$(cat VERSION 2> /dev/null)
-test $version || version=git-$git_revision
+test $version || version=$git_revision

-NEW_REVISION="#define VERSION \"${version}${extra}\""
+VERSION="${version}${extra}"
+
+if test "$print" = yes ; then
+    echo "$VERSION"
+    exit 0
+fi
+
+NEW_REVISION="#define VERSION \"${VERSION}\""
 OLD_REVISION=$(head -n 1 version.h 2> /dev/null)
 BUILDDATE="#define BUILDDATE \"$(date)\""

@@ -289,8 +289,8 @@ void vo_destroy(struct vo *vo)
 {
    if (vo->registered_fd != -1)
        mp_input_rm_key_fd(vo->input_ctx, vo->registered_fd);
+    mp_image_unrefp(&vo->waiting_mpi);
    vo->driver->uninit(vo);
-    talloc_free(vo->waiting_mpi);
    talloc_free(vo);
 }

@@ -74,6 +74,7 @@
 #define vo_wm_STAYS_ON_TOP 4
 #define vo_wm_ABOVE 8
 #define vo_wm_BELOW 16
+#define vo_wm_MWM 32
 #define vo_wm_NETWM (vo_wm_FULLSCREEN | vo_wm_STAYS_ON_TOP | vo_wm_ABOVE | \
                     vo_wm_BELOW)

@@ -252,6 +253,8 @@ void fstype_help(void)
           "use _NETWM_STATE_FULLSCREEN hint if available");
    mp_msg(MSGT_VO, MSGL_INFO, "    %-15s %s\n", "stays_on_top",
           "use _NETWM_STATE_STAYS_ON_TOP hint if available");
+    mp_msg(MSGT_VO, MSGL_INFO, "    %-15s %s\n", "mwm_hack",
+           "enable MWM hack");
    mp_msg(MSGT_VO, MSGL_INFO,
           "You can also negate the settings with simply putting '-' in the beginning");
    mp_msg(MSGT_VO, MSGL_INFO, "\n");
@@ -271,6 +274,8 @@ static void fstype_dump(int fstype)
            mp_msg(MSGT_VO, MSGL_V, " ABOVE");
        if (fstype & vo_wm_BELOW)
            mp_msg(MSGT_VO, MSGL_V, " BELOW");
+        if (fstype & vo_wm_MWM)
+            mp_msg(MSGT_VO, MSGL_V, " mwm_hack");
        mp_msg(MSGT_VO, MSGL_V, " X atoms\n");
    } else {
        mp_msg(MSGT_VO, MSGL_V,
@@ -1235,6 +1240,11 @@ static int vo_x11_get_fs_type(struct vo *vo)
                    type &= ~vo_wm_NETWM;
                else
                    type |= vo_wm_NETWM;
+            } else if (!strcmp(arg, "mwm_hack")) {
+                if (neg)
+                    type &= ~vo_wm_MWM;
+                else
+                    type |= vo_wm_MWM;
            } else if (!strcmp(arg, "none"))
                type = 0;  // clear; keep parsing
        }
@@ -1336,7 +1346,7 @@ static void vo_x11_fullscreen(struct vo *vo)
        else
            x11->old_gravity = x11->vo_hint.win_gravity;
    }
-    if (x11->wm_type == 0 && !(vo->opts->fsmode & 16)) {
+    if (x11->fs_type & vo_wm_MWM) {
        XUnmapWindow(x11->display, x11->window);      // required for MWM
        XWithdrawWindow(x11->display, x11->window, x11->screen);
        x11->fs_flip = 1;
Author	SHA1	Message	Date
wm4	4f728cfb99	Add VERSION for release No idea what the correct workflow is for these things. In any case, we somehow have to make the github release system to include the correct version in its tarball. I don't think you can provide your own tarballs either, so it has to be in git.	2013-08-12 00:18:22 +02:00
wm4	cdf4b7d2ee	x11_common: get hack for Motif Window Manager out of the way Disable the hack by default, because it's interfering with some more modern WMs. MWM (Motif Window Manager) is probably pretty dead, but we still allow enabling the old hack with "--fstype=mwm_hack". See github issue #179.	2013-08-11 23:59:18 +02:00
wm4	e978511d63	vo: unref waiting image before destroying VO driver This is in theory more correct with respect to hardware decoding. With hardware decoding, the VOs play the role of the video surface allocator, and nothing is allowed to reference surfaces past the VO lifetime. But in theory waiting_mpi could be a reference to a HW video surface, so it should be relased before the VO is uninitialized.	2013-08-11 20:09:06 +02:00
wm4	abe47a4840	core: make sure hw decoding works when playing multiple files The hw decoding context was set only for the first file (when the VO was initialized), instead of every file.	2013-08-11 20:08:00 +02:00
wm4	c6db8f6a8b	version.sh: add --print option, which prints version to stdout Might be helpful when creating a tarball.	2013-08-09 10:07:23 +02:00
wm4	b27f65a758	version.sh: integrate the release tag in output This is basically reconstructed from `46b218c`. Since we now have proper release tags, we want this again. Add --tags to the git describe call, because the github release system creates light-weight tags only, and we're too lazy to create annitated tags (or is that bad practice?). Add --long, so that the git commit hash is part of the output even if the tag matches.	2013-08-09 09:44:24 +02:00