Rémi Denis-Courmont pushed to branch 3.0.x at VideoLAN / VLC


Commits:
5338b87f by AsciiWolf at 2025-11-13T21:12:37+02:00
appdata: fix AppStream metadata file name, other small fixes

The file name should match the app id

Also add OARS metadata, fix default screenshot and fix component type

(cherry picked from commit a66e01306dd5a072cf9e7e61763be967f8648110)
Signed-off-by: Rémi Denis-Courmont <[email protected]>

Conflicts:
        configure.ac
        po/POTFILES.in
        share/.gitignore
        share/Makefile.am
        share/org.videolan.vlc.appdata.xml.in.in

- - - - -


5 changed files:

- configure.ac
- po/POTFILES.in
- share/.gitignore
- share/Makefile.am
- share/vlc.appdata.xml.in.in → share/org.videolan.vlc.appdata.xml.in.in


Changes:

=====================================
configure.ac
=====================================
@@ -4447,7 +4447,7 @@ AC_CONFIG_FILES([
   bin/Makefile
   test/Makefile
   modules/hw/mmal/Makefile
-  share/vlc.appdata.xml.in
+  share/org.videolan.vlc.appdata.xml.in
 ])
 
 AM_COND_IF([HAVE_WIN32], [


=====================================
po/POTFILES.in
=====================================
@@ -1265,7 +1265,7 @@ modules/visualization/projectm.cpp
 modules/visualization/visual/visual.c
 modules/visualization/visual/window_presets.h
 modules/visualization/vsxu.cpp
-share/vlc.appdata.xml.in.in
+share/org.videolan.vlc.appdata.xml.in.in
 share/lua/http/dialogs/batch_window.html
 share/lua/http/dialogs/browse_window.html
 share/lua/http/dialogs/create_stream.html


=====================================
share/.gitignore
=====================================
@@ -1,3 +1,3 @@
 vlc.desktop
-vlc.appdata.xml
-vlc.appdata.xml.in
+org.videolan.vlc.appdata.xml
+org.videolan.vlc.appdata.xml.in


=====================================
share/Makefile.am
=====================================
@@ -7,8 +7,7 @@ if !HAVE_WIN32
 if !HAVE_DARWIN
 desktop_DATA = vlc.desktop
 appdatadir = $(datarootdir)/metainfo
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = vlc.appdata.xml.in
+appdata_DATA = org.videolan.vlc.appdata.xml
 endif
 endif
 
@@ -23,7 +22,7 @@ vlc.desktop: vlc.desktop.in $(top_builddir)/config.status
        $(AM_V_at)$(DESKTOP_FILE_VALIDATE) tmp-$@
        $(AM_V_at)mv -f tmp-$@ $@
 
-vlc.appdata.xml: vlc.appdata.xml.in
+org.videolan.vlc.appdata.xml: org.videolan.vlc.appdata.xml.in
        $(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ || 
cp $< $@
 
 iconsdatadir = $(datadir)/icons/hicolor


=====================================
share/vlc.appdata.xml.in.in → share/org.videolan.vlc.appdata.xml.in.in
=====================================
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2016-2017 Jean-Baptiste Kempf CC-0 -->
 
-<component type="desktop">
+<component type="desktop-application">
     <id>org.videolan.vlc</id>
     <launchable type="desktop-id">vlc.desktop</launchable>
     <metadata_license>CC0-1.0</metadata_license>
@@ -31,11 +31,12 @@
         <screenshot type="default">
             
<image>http://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-poney.jpg</image>
         </screenshot>
-        <screenshot type="default">
+        <screenshot>
             
<image>http://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-gnome3-open.jpg</image>
         </screenshot>
-        <screenshot type="default">
+        <screenshot>
             
<image>http://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-gnome3-debian.jpg</image>
         </screenshot>
     </screenshots>
+    <content_rating type="oars-1.1" />
 </component>



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/5338b87fb1e24f848ce7fc80eea9b5ab70642700

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/5338b87fb1e24f848ce7fc80eea9b5ab70642700
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance
_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to