[vlc-commits] [Git][videolan/vlc][master] 4 commits: win32: manifest: update the libvlc support OS versions

Wed Dec 7 08:51:32 UTC 2022


Felix Paul Kühne pushed to branch master at VideoLAN / VLC


Commits:
6f3685c9 by Steve Lhomme at 2022-12-07T08:33:39+00:00
win32: manifest: update the libvlc support OS versions

Use the same values as for vlc.exe.

- - - - -
531d7e59 by Steve Lhomme at 2022-12-07T08:33:39+00:00
win32: separate the libvlccore DLL files

libvlccore.dll should not be defined as libvlc.dll

- - - - -
5157650a by Steve Lhomme at 2022-12-07T08:33:39+00:00
win32: move libvlc_win32_rc in the lib folder

- - - - -
32160df7 by Steve Lhomme at 2022-12-07T08:33:39+00:00
win32: set the proper libvlc version in the DLL

- - - - -


8 changed files:

- extras/package/win32/libvlc.dll.manifest
- + extras/package/win32/libvlccore.dll.manifest
- extras/package/win32/package.mak
- lib/Makefile.am
- src/libvlc_win32_rc.rc.in → lib/libvlc_win32_rc.rc.in
- src/.gitignore
- src/Makefile.am
- + src/libvlccore_win32_rc.rc.in


Changes:

=====================================
extras/package/win32/libvlc.dll.manifest
=====================================
@@ -9,8 +9,12 @@
     <description>LibVLC</description>
     <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
         <application>
-            <!--The ID below indicates app support for Windows Vista -->
-            <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+            <!--The ID below indicates application support for Windows 7 -->
+            <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+            <!--The ID below indicates app support for Windows 8 -->
+            <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+            <!--The ID below indicates app support for Windows 8.1 -->
+            <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
         </application>
     </compatibility>
 </assembly>


=====================================
extras/package/win32/libvlccore.dll.manifest
=====================================
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <assemblyIdentity
+        version="1.0.0.0"
+        processorArchitecture="*"
+        name="libvlccore.dll"
+        type="win32"
+    />
+    <description>LibVLC</description>
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+        <application>
+            <!--The ID below indicates application support for Windows 7 -->
+            <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+            <!--The ID below indicates app support for Windows 8 -->
+            <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+            <!--The ID below indicates app support for Windows 8.1 -->
+            <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+        </application>
+    </compatibility>
+</assembly>


=====================================
extras/package/win32/package.mak
=====================================
@@ -187,6 +187,7 @@ package-wince: package-win-strip
 EXTRA_DIST += \
 	extras/package/win32/vlc.exe.manifest \
 	extras/package/win32/libvlc.dll.manifest \
+	extras/package/win32/libvlccore.dll.manifest \
 	extras/package/win32/configure.sh \
 	extras/package/win32/NSIS/vlc.win32.nsi.in \
 	extras/package/win32/NSIS/spad.nsi.in \


=====================================
lib/Makefile.am
=====================================
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 pkgconfigdir = $(libdir)/pkgconfig
 AM_CFLAGS = $(CFLAGS_libvlc)
 
-SUFFIXES = .pc.in .pc
+SUFFIXES = .pc.in .pc .rc.in .rc
 
 BUILT_SOURCES = $(nodist_pkginclude_HEADERS)
 CLEANFILES = $(BUILT_SOURCES) $(pkgconfig_DATA)
@@ -57,6 +57,15 @@ libvlc_la_SOURCES = \
 	../src/revision.c
 EXTRA_DIST = libvlc.pc.in libvlc.sym ../include/vlc/libvlc_version.h.in
 
+if HAVE_WIN32
+noinst_DATA = libvlc_win32_rc.rc
+endif
+EXTRA_DIST += libvlc_win32_rc.rc.in
+
+libvlc_win32_rc.rc: libvlc_win32_rc.rc.in $(top_builddir)/config.status
+	$(AM_V_GEN)cd "$(top_builddir)" && \
+	$(SHELL) ./config.status --file="lib/$@"
+
 libvlc_la_LIBADD = ../src/libvlccore.la ../compat/libcompat.la $(LIBM)
 libvlc_la_LDFLAGS = \
 	$(LDFLAGS_libvlc) \
@@ -65,8 +74,8 @@ libvlc_la_LDFLAGS = \
 	-export-symbols $(srcdir)/libvlc.sym
 libvlc_la_DEPENDENCIES = libvlc.sym
 if HAVE_WIN32
-libvlc_la_DEPENDENCIES += ../src/libvlc_win32_rc.$(OBJEXT)
-libvlc_la_LDFLAGS += -Wl,../src/libvlc_win32_rc.$(OBJEXT) -avoid-version -Wc,-static
+libvlc_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
+libvlc_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) -avoid-version -Wc,-static
 endif
 if HAVE_OS2
 libvlc_la_LDFLAGS += -avoid-version
@@ -90,5 +99,8 @@ libvlc.pc: libvlc.pc.in $(top_builddir)/config.status
 	$(AM_V_GEN)cd "$(top_builddir)" && \
 	$(SHELL) ./config.status --file="lib/$@"
 
+libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc $(top_srcdir)/extras/package/win32/libvlc.dll.manifest
+	$(WINDRES) --include-dir $(top_srcdir)/share --include-dir $(top_srcdir)/extras/package/win32 -i $< -o $@
+
 check-local:
 	$(SHELL) $(top_srcdir)/src/check_headers $(pkginclude_HEADERS)


=====================================
src/libvlc_win32_rc.rc.in → lib/libvlc_win32_rc.rc.in
=====================================
@@ -1,5 +1,7 @@
 #define VERSION_NUMBER @VERSION_MAJOR@, at VERSION_MINOR@, at VERSION_REVISION@, at VERSION_EXTRA@
 #define VERSION_NUMBER_STR "@VERSION_MAJOR@, at VERSION_MINOR@, at VERSION_REVISION@, at VERSION_EXTRA@"
+#define LIBVLC_VERSION_NUMBER @LIBVLC_ABI_MAJOR@, at LIBVLC_ABI_MINOR@, at LIBVLC_ABI_MICRO@
+#define LIBVLC_VERSION_NUMBER_STR "@LIBVLC_ABI_MAJOR@, at LIBVLC_ABI_MINOR@, at LIBVLC_ABI_MICRO@"
 
 #include <winuser.h>
 
@@ -7,7 +9,7 @@
 FILETYPE 2
 FILEOS 4
 PRODUCTVERSION VERSION_NUMBER
-FILEVERSION VERSION_NUMBER
+FILEVERSION LIBVLC_VERSION_NUMBER
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
@@ -16,7 +18,7 @@ BEGIN
       VALUE "CompanyName", "VideoLAN"
       VALUE "ProductName", "VLC media player"
       VALUE "ProductVersion", VERSION_NUMBER_STR
-      VALUE "FileVersion", "@VERSION@"
+      VALUE "FileVersion", LIBVLC_VERSION_NUMBER_STR
       VALUE "FileDescription", "VLC media player"
       VALUE "LegalCopyright", "Copyright \251 @COPYRIGHT_YEARS@ VideoLAN and VLC Authors"
       VALUE "LegalTrademarks", "VLC media player, VideoLAN and x264 are registered trademarks from VideoLAN"


=====================================
src/.gitignore
=====================================
@@ -1,6 +1,6 @@
 test_*
 fourcc_gen
 fourcc_tables.h
-libvlc_win32_rc.rc
+libvlccore_win32_rc.rc
 revision.c
 revision.txt


=====================================
src/Makefile.am
=====================================
@@ -168,11 +168,11 @@ vlc-plugin.pc: vlc-plugin.pc.in $(top_builddir)/config.status
 ##############################################################################
 
 if HAVE_WIN32
-noinst_DATA = libvlc_win32_rc.rc
+noinst_DATA = libvlccore_win32_rc.rc
 endif
-EXTRA_DIST += libvlc_win32_rc.rc.in
+EXTRA_DIST += libvlccore_win32_rc.rc.in
 
-libvlc_win32_rc.rc: libvlc_win32_rc.rc.in $(top_builddir)/config.status
+libvlccore_win32_rc.rc: libvlccore_win32_rc.rc.in $(top_builddir)/config.status
 	$(AM_V_GEN)cd "$(top_builddir)" && \
 	$(SHELL) ./config.status --file="src/$@"
 
@@ -558,8 +558,8 @@ libvlccore_la_LDFLAGS = \
 	-version-info 9:0:0
 libvlccore_la_DEPENDENCIES = libvlccore.sym
 if HAVE_WIN32
-libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
-libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) -avoid-version -Wc,-static
+libvlccore_la_DEPENDENCIES += libvlccore_win32_rc.$(OBJEXT)
+libvlccore_la_LDFLAGS += -Wl,libvlccore_win32_rc.$(OBJEXT) -avoid-version -Wc,-static
 endif
 if HAVE_OS2
 libvlccore_la_LDFLAGS += -avoid-version
@@ -584,7 +584,7 @@ if HAVE_TVOS
 libvlccore_la_LDFLAGS += -avoid-version
 endif
 
-libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc $(top_srcdir)/extras/package/win32/libvlc.dll.manifest
+libvlccore_win32_rc.$(OBJEXT): libvlccore_win32_rc.rc $(top_srcdir)/extras/package/win32/libvlccore.dll.manifest
 	$(WINDRES) --include-dir $(top_srcdir)/share --include-dir $(top_srcdir)/extras/package/win32 -i $< -o $@
 
 # FourCC tables


=====================================
src/libvlccore_win32_rc.rc.in
=====================================
@@ -0,0 +1,31 @@
+#define VERSION_NUMBER @VERSION_MAJOR@, at VERSION_MINOR@, at VERSION_REVISION@, at VERSION_EXTRA@
+#define VERSION_NUMBER_STR "@VERSION_MAJOR@, at VERSION_MINOR@, at VERSION_REVISION@, at VERSION_EXTRA@"
+
+#include <winuser.h>
+
+1 VERSIONINFO
+FILETYPE 2
+FILEOS 4
+PRODUCTVERSION VERSION_NUMBER
+FILEVERSION VERSION_NUMBER
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    BEGIN
+      VALUE "CompanyName", "VideoLAN"
+      VALUE "ProductName", "VLC media player"
+      VALUE "ProductVersion", VERSION_NUMBER_STR
+      VALUE "FileVersion", "@VERSION@"
+      VALUE "FileDescription", "VLC media player"
+      VALUE "LegalCopyright", "Copyright \251 @COPYRIGHT_YEARS@ VideoLAN and VLC Authors"
+      VALUE "LegalTrademarks", "VLC media player, VideoLAN and x264 are registered trademarks from VideoLAN"
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x409, 1252
+  END
+END
+
+ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "libvlccore.dll.manifest"



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3c2469ccacbc3718c0fdec5b98383d4f67284429...32160df71848882d209c81c1310a78654d2caf5b

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3c2469ccacbc3718c0fdec5b98383d4f67284429...32160df71848882d209c81c1310a78654d2caf5b
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance
