[virt-tools-list] [PATCH] nsis: use gstreamer-1.0 instead of gstreamer-0.10

Fabiano Fidêncio fidencio at redhat.com
Mon Jan 5 22:48:22 UTC 2015


On Mon, 2015-01-05 at 23:27 +0100, Fabiano Fidêncio wrote:
> On Mon, Jan 5, 2015 at 7:41 PM, Victor Toso <victortoso at redhat.com> wrote:
> > Spice-gtk now is able to use gstreamer-1.0 for playback and record
> > audio. This patch updates the installer to use the latest version.
> > ---
> >  data/virt-viewer.nsis.in | 114 +++++++++++++++++++++--------------------------
> >  1 file changed, 52 insertions(+), 62 deletions(-)
> >
> > diff --git a/data/virt-viewer.nsis.in b/data/virt-viewer.nsis.in
> > index c6d4cac..a83af8f 100755
> > --- a/data/virt-viewer.nsis.in
> > +++ b/data/virt-viewer.nsis.in
> > @@ -66,27 +66,19 @@ Section "VirtViewer"
> >
> >    SetOutPath "$INSTDIR\bin"
> >    !if ${HaveSpiceGtk} == True
> > -    File "@prefix@/bin/gst-discoverer-0.10.exe"
> > -    File "@prefix@/bin/gst-feedback.exe"
> > -    File "@prefix@/bin/gst-inspect-0.10.exe"
> > -    File "@prefix@/bin/gst-inspect.exe"
> > -    File "@prefix@/bin/gst-launch-0.10.exe"
> > -    File "@prefix@/bin/gst-launch.exe"
> > -    File "@prefix@/bin/gst-typefind-0.10.exe"
> > -    File "@prefix@/bin/gst-typefind.exe"
> > -    File "@prefix@/bin/gst-xmlinspect-0.10.exe"
> > -    File "@prefix@/bin/gst-xmlinspect.exe"
> > -    File "@prefix@/bin/gst-xmllaunch-0.10.exe"
> > -    File "@prefix@/bin/gst-xmllaunch.exe"
> > -    File "@prefix@/bin/libgstapp-0.10-0.dll"
> > -    File "@prefix@/bin/libgstaudio-0.10-0.dll"
> > -    File "@prefix@/bin/libgstbase-0.10-0.dll"
> > -    File "@prefix@/bin/libgstcontroller-0.10-0.dll"
> > -    File "@prefix@/bin/libgstfft-0.10-0.dll"
> > -    File "@prefix@/bin/libgstinterfaces-0.10-0.dll"
> > -    File "@prefix@/bin/libgstpbutils-0.10-0.dll"
> > -    File "@prefix@/bin/libgstreamer-0.10-0.dll"
> > -    File "@prefix@/bin/libgstvideo-0.10-0.dll"
> > +    # gstreamer1
> > +    File "@prefix@/bin/gst-inspect-1.0.exe"
> > +    File "@prefix@/bin/gst-launch-1.0.exe"
> > +    File "@prefix@/bin/gst-typefind-1.0.exe"
> > +    File "@prefix@/bin/libgstbase-1.0-0.dll"
> > +    File "@prefix@/bin/libgstcontroller-1.0-0.dll"
> > +    File "@prefix@/bin/libgstreamer-1.0-0.dll"
> > +    # gstreamer1-plugins-base
> > +    File "@prefix@/bin/libgstapp-1.0-0.dll"
> > +    File "@prefix@/bin/libgstaudio-1.0-0.dll"
> > +    File "@prefix@/bin/libgstfft-1.0-0.dll"
> > +    File "@prefix@/bin/libgstpbutils-1.0-0.dll"
> > +    File "@prefix@/bin/libgsttag-1.0-0.dll"
> >
> >      File "@prefix@/bin/libusb-1.0.dll"
> >      File "@prefix@/bin/libusbredirhost-1.dll"
> > @@ -224,16 +216,19 @@ Section "VirtViewer"
> >    File /r "@prefix@/lib/pango"
> >
> >    !if ${HaveSpiceGtk} == True
> > -    SetOutPath "$INSTDIR\lib\gstreamer-0.10"
> > -    File "@prefix@/lib/gstreamer-0.10/libgstapp.dll"
> > -    File "@prefix@/lib/gstreamer-0.10/libgstaudioconvert.dll"
> > -    File "@prefix@/lib/gstreamer-0.10/libgstaudiorate.dll"
> > -    File "@prefix@/lib/gstreamer-0.10/libgstaudioresample.dll"
> > -    File "@prefix@/lib/gstreamer-0.10/libgstaudiotestsrc.dll"
> > -    File "@prefix@/lib/gstreamer-0.10/libgstautodetect.dll"
> > -    File "@prefix@/lib/gstreamer-0.10/libgstcoreelements.dll"
> > -    File "@prefix@/lib/gstreamer-0.10/libgstdirectsoundsink.dll"
> > -    File "@prefix@/lib/gstreamer-0.10/libgstdirectsoundsrc.dll"
> > +    SetOutPath "$INSTDIR\lib\gstreamer-1.0"
> > +    # gstreamer1
> > +    File "@prefix@/lib/gstreamer-1.0/libgstcoreelements.dll"
> > +    # gstreamer1-plugins-base
> > +    File "@prefix@/lib/gstreamer-1.0/libgstapp.dll"
> > +    File "@prefix@/lib/gstreamer-1.0/libgstaudioconvert.dll"
> > +    File "@prefix@/lib/gstreamer-1.0/libgstaudiorate.dll"
> > +    File "@prefix@/lib/gstreamer-1.0/libgstaudioresample.dll"
> > +    # gstreamer1-plugins-good
> > +    File "@prefix@/lib/gstreamer-1.0/libgstautodetect.dll"
> > +    File "@prefix@/lib/gstreamer-1.0/libgstdirectsoundsink.dll"
> > +    # gstreamer1-plugins-bad
> > +    File "@prefix@/lib/gstreamer-1.0/libgstdirectsoundsrc.dll"
> >    !endif
> >
> >    !if ${HaveOVirt} == True
> > @@ -520,16 +515,19 @@ Section "Uninstall"
> >    !endif
> >
> >    !if ${HaveSpiceGtk} == True
> > -    Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstdirectsoundsrc.dll"
> > -    Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstdirectsoundsink.dll"
> > -    Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstcoreelements.dll"
> > -    Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstautodetect.dll"
> > -    Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudiotestsrc.dll"
> > -    Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudioresample.dll"
> > -    Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudiorate.dll"
> > -    Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudioconvert.dll"
> > -    Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstapp.dll"
> > -    RMDir "$INSTDIR\lib\gstreamer-0.10"
> > +    # gstreamer1
> > +    Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstcoreelements.dll"
> > +    # gstreamer1-plugins-base
> > +    Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstapp.dll"
> > +    Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstaudioconvert.dll"
> > +    Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstaudiorate.dll"
> > +    Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstaudioresample.dll"
> > +    # gstreamer1-plugins-good
> > +    Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstautodetect.dll"
> > +    Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstdirectsoundsink.dll"
> > +    # gstreamer1-plugins-bad
> > +    Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstdirectsoundsrc.dll"
> > +    RMDir "$INSTDIR\lib\gstreamer-1.0"
> >    !endif
> >    RMDir /r "$INSTDIR\lib\gdk-pixbuf-2.0"
> >
> > @@ -555,27 +553,19 @@ Section "Uninstall"
> >      Delete /rebootok "$INSTDIR\bin\libgdk-3-0.dll"
> >    !endif
> >    !if ${HaveSpiceGtk} == True
> > -    Delete /rebootok "$INSTDIR\bin\gst-xmllaunch.exe"
> > -    Delete /rebootok "$INSTDIR\bin\gst-xmllaunch-0.10.exe"
> > -    Delete /rebootok "$INSTDIR\bin\gst-xmlinspect.exe"
> > -    Delete /rebootok "$INSTDIR\bin\gst-xmlinspect-0.10.exe"
> > -    Delete /rebootok "$INSTDIR\bin\gst-typefind.exe"
> > -    Delete /rebootok "$INSTDIR\bin\gst-typefind-0.10.exe"
> > -    Delete /rebootok "$INSTDIR\bin\gst-launch.exe"
> > -    Delete /rebootok "$INSTDIR\bin\gst-launch-0.10.exe"
> > -    Delete /rebootok "$INSTDIR\bin\gst-inspect.exe"
> > -    Delete /rebootok "$INSTDIR\bin\gst-inspect-0.10.exe"
> > -    Delete /rebootok "$INSTDIR\bin\gst-feedback.exe"
> > -    Delete /rebootok "$INSTDIR\bin\gst-discoverer-0.10.exe"
> > -    Delete /rebootok "$INSTDIR\bin\libgstvideo-0.10-0.dll"
> > -    Delete /rebootok "$INSTDIR\bin\libgstreamer-0.10-0.dll"
> > -    Delete /rebootok "$INSTDIR\bin\libgstpbutils-0.10-0.dll"
> > -    Delete /rebootok "$INSTDIR\bin\libgstinterfaces-0.10-0.dll"
> > -    Delete /rebootok "$INSTDIR\bin\libgstfft-0.10-0.dll"
> > -    Delete /rebootok "$INSTDIR\bin\libgstcontroller-0.10-0.dll"
> > -    Delete /rebootok "$INSTDIR\bin\libgstbase-0.10-0.dll"
> > -    Delete /rebootok "$INSTDIR\bin\libgstaudio-0.10-0.dll"
> > -    Delete /rebootok "$INSTDIR\bin\libgstapp-0.10-0.dll"
> > +    # gstreamer1
> > +    Delete /rebootok "$INSTDIR\bin\gst-inspect-1.0.exe"
> > +    Delete /rebootok "$INSTDIR\bin\gst-launch-1.0.exe"
> > +    Delete /rebootok "$INSTDIR\bin\gst-typefind-1.0.exe"
> > +    Delete /rebootok "$INSTDIR\bin\libgstbase-1.0-0.dll"
> > +    Delete /rebootok "$INSTDIR\bin\libgstcontroller-1.0-0.dll"
> > +    Delete /rebootok "$INSTDIR\bin\libgstreamer-1.0-0.dll"
> > +    # gstreamer1-plugins-base
> > +    Delete /rebootok "$INSTDIR\bin\libgstapp-1.0-0.dll"
> > +    Delete /rebootok "$INSTDIR\bin\libgstaudio-1.0-0.dll"
> > +    Delete /rebootok "$INSTDIR\bin\libgstfft-1.0-0.dll"
> > +    Delete /rebootok "$INSTDIR\bin\libgstpbutils-1.0-0.dll"
> > +    Delete /rebootok "$INSTDIR\bin\libgsttag-1.0-0.dll"
> >
> >      Delete /rebootok "$INSTDIR\bin\libusb-1.0.dll"
> >      Delete /rebootok "$INSTDIR\bin\libusbredirhost-1.dll"
> > --
> > 2.1.0
> >
> > _______________________________________________
> > virt-tools-list mailing list
> > virt-tools-list at redhat.com
> > https://www.redhat.com/mailman/listinfo/virt-tools-list
> 
> ACK!
> But depends on http://koji.fedoraproject.org/koji/buildinfo?buildID=602204
> for testing ...
> 

Pushed as 3bbf1ded1cb01429d600b11035d5fb0d60bfe20b




More information about the virt-tools-list mailing list