diff options
Diffstat (limited to 'multimedia/winff')
25 files changed, 395 insertions, 764 deletions
diff --git a/multimedia/winff/README b/multimedia/winff/README index 10961045aa..7a65a950cb 100644 --- a/multimedia/winff/README +++ b/multimedia/winff/README @@ -9,26 +9,26 @@ NOTE: If you have a previous ~/.winff directory you might want to remove it or your presets might not be updated. -WinFF is no longer maintained by the original author.It is currently -maintained by Debian maintainer Paul Gevers and the website winff.org -has been hijacked see the following post for details. +WinFF is no longer maintained by the original author. It is currently +maintained by Debian maintainer Paul Gevers and the website winff.org +has been hijacked. See the following post for details: https://github.com/WinFF/winff/issues/250 -I've patched link for the FFmpeg Windows build website in the about -section to point it to correct website as mentioned in the FFmpeg -Website. see the following link for details. +I've patched the link for the FFmpeg Windows build website in the +about section to point it to correct website as mentioned on the +FFmpeg website. See the following link for details: https://ffmpeg.org/download.html#build-windows -The Launchpad link no longer works and i've patched it to -point to the winff debian maintainer's [Paul Gevers] page. -I've made sure other websites link to https version. +The Launchpad link no longer works and I've patched it to point to +the WinFF Debian maintainer's [Paul Gevers] page. I've made sure other +websites link to the https version. -There was also an issue with opening the documetation in slackware, -The paths to the documetation is hardcoded in the source file. -I've patched it to look in the /usr/doc/$PRGNAM-$VERSION folder +There was also an issue with opening the documentation in Slackware. +The path to the documetation is hardcoded in the source file. +I've patched it to look in the /usr/doc/$PRGNAM-$VERSION directory. I've patched winff to use xdg-open to use the user's default -pdf viewer. +PDF viewer. -This build now uses qt5 hence libqtpas is now a dependency. -Install libqtpas before installing lazarus. +This build now uses qt5, hence libqtpas is now a dependency. Install +libqtpas before installing lazarus. diff --git a/multimedia/winff/changelog b/multimedia/winff/changelog index 6da305c6fb..e464b2ee64 100644 --- a/multimedia/winff/changelog +++ b/multimedia/winff/changelog @@ -70,3 +70,59 @@ in slackware. This build removes all other localization files except english since it contains outdated links and may pose security risk. Bumped the build no. + +20/01/2023: + +Fixed $ARCH issue for 32-bit systems. freepascal supports i386 +only. The SlackBuild is modified to reflect that.Bumped the +build no. + +Users of WinFF must be aware of these two security issues that are +still unresolved upstream. + +a. The first one is due to the way filenames are inserted in the +temporary shell scripts generated to convert the media. Due to the +lack of character escaping, it is possible to insert system command using +specially crafted filename such as 'aaa";xcalc;".avi' or "aaa$(xcalc).mp4' +Thus leading to an arbitrary command execution. + +b. The second issue is related to the permission of this temporary shell +script. every users can access to them and modify them. Even if those files +are only temporary and launched right after generation, it leads to a +race-condition case where another user may try to replace the script content +before its execution in order to execute its own command with the winff +user permission. + +you can read about this issue here: +https://github.com/WinFF/winff/issues/242 + +As for first issue check the filename before converting otherwise it +will compromise your system and don't download from untrusted sources. +For the second I have no clue and this is beyond my abilities.If you have +a patch for these issue feel free to send it to me. + + +11/01/2024: + +Upgraded to the latest git commit 31b79e3. + +22/01/2024: + +Added -pie and -zdefs hardening flags to linker. +Bumped the build no. + +27/02/2024: + +Updated to version 1.6.3 + +03/03/2024: + +Resubmit to SBo +Modify the SlackBuild to avoid creating object code files to /usr/share/lazarus +when compiling winff and remove unused function in doinst.sh Thanks to Andrew Clemons +for pointing it out. + +27/04/2024: + +Updated to version 1.6.4 +Fixed dead links. Fix documentation to properly open the pdf. diff --git a/multimedia/winff/doinst.sh b/multimedia/winff/doinst.sh index aea0f894eb..5fb28930db 100644 --- a/multimedia/winff/doinst.sh +++ b/multimedia/winff/doinst.sh @@ -1,13 +1,3 @@ if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi - -if [ -x /usr/bin/update-mime-database ]; then - /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi diff --git a/multimedia/winff/patches/unit1-pas.patch b/multimedia/winff/patches/unit1-pas.patch new file mode 100644 index 0000000000..cb6ddd2217 --- /dev/null +++ b/multimedia/winff/patches/unit1-pas.patch @@ -0,0 +1,47 @@ +--- unit1.pas 2024-04-17 01:41:03.000000000 +0530 ++++ unit1n.pas 2024-04-25 19:19:53.307142871 +0530 +@@ -1,8 +1,8 @@ + unit Unit1; + +-// WInFF 1.0 Copyright 2006-2012 Matthew Weatherford ++// WInFF 1.0 Copyright 2006-2024 Matthew Weatherford + // WinFF 1.3.2 Copyright 2011 Alexey Osipov <lion-simba@pridelands.ru> +-// http://winff.org ++// https://github.com/WinFF/winff + // Licensed under the GPL v3 or any later version + + // This program is free software: you can redistribute it and/or modify +@@ -1795,20 +1795,12 @@ + language:=leftstr(lang,2); + {$ifdef unix} + s :=''; +- if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/doc/winff/WinFF.' + language + '.pdf.gz'; +- if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf') then s:='/usr/share/doc/winff/WinFF.' + language + '.pdf'; +- if fileexists('/usr/share/winff/WinFF.' + language + '.pdf') then s:='/usr/share/winff/WinFF.' + language + '.pdf'; +- if fileexists('/usr/share/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/winff/WinFF.' + language + '.pdf.gz'; +- if fileexists('/usr/share/doc/packages/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/doc/packages/winff/WinFF.' + language + '.pdf.gz'; +- if fileexists('/usr/share/doc/packages/winff/WinFF.' + language + '.pdf') then s:='/usr/share/doc/packages/winff/WinFF.' + language + '.pdf'; ++ if fileexists('/usr/doc/winff-1.6.4/WinFF.' + language + '.pdf.gz') then s:='/usr/doc/winff-1.6.4/WinFF.' + language + '.pdf.gz'; ++ if fileexists('/usr/doc/winff-1.6.4/WinFF.' + language + '.pdf') then s:='/usr/doc/winff-1.6.4/WinFF.' + language + '.pdf'; + if s='' then + begin +- s := '/usr/share/doc/winff/WinFF.en.pdf.gz'; +- if fileexists('/usr/share/doc/winff/WinFF.en.pdf') then s:='/usr/share/doc/winff/WinFF.en.pdf'; +- if fileexists('/usr/share/winff/WinFF.en.pdf') then s:='/usr/share/winff/WinFF.en.pdf'; +- if fileexists('/usr/share/winff/WinFF.en.pdf.gz') then s:='/usr/share/winff/WinFF.en.pdf.gz'; +- if fileexists('/usr/share/doc/packages/winff/WinFF.en.pdf.gz') then s:='/usr/share/doc/packages/winff/WinFF.en.pdf.gz'; +- if fileexists('/usr/share/doc/packages/winff/WinFF.en.pdf') then s:='/usr/share/doc/packages/winff/WinFF.en.pdf'; ++ s := '/usr/doc/winff-1.6.4/WinFF.en.pdf.gz'; ++ if fileexists('/usr/doc/winff-1.6.4/WinFF.en.pdf') then s:='/usr/doc/winff-1.6.4/WinFF.en.pdf'; + end; + {$endif} + {$IFDEF WINDOWS} +@@ -1821,7 +1813,7 @@ + //menu: Help Forums + procedure TfrmMain.mitForumsClick(Sender: TObject); + begin +- launchbrowser('https://groups.google.com/g/winff'); ++ launchbrowser('http://github.com/WinFF/winff/issues'); + end; + + procedure TfrmMain.mitRestoreDefaultsClick(Sender: TObject); diff --git a/multimedia/winff/patches/unit1_lfm.patch b/multimedia/winff/patches/unit1_lfm.patch deleted file mode 100644 index d5373a41fd..0000000000 --- a/multimedia/winff/patches/unit1_lfm.patch +++ /dev/null @@ -1,246 +0,0 @@ ---- winff-1/winff/unit1.lfm 2022-09-03 11:44:10.000000000 +0530 -+++ winff-2/winff/unit1.lfm 2022-09-24 16:48:10.735961896 +0530 -@@ -364,7 +364,7 @@ - object pnlTop: TPanel - Left = 0 - Height = 55 -- Hint = 'TEST' -+ Hint = '' - Top = 0 - Width = 640 - Align = alTop -@@ -915,11 +915,11 @@ - TabOrder = 5 - end - object btnOptions: TBitBtn -- Left = 571 -+ Left = 540 - Height = 53 - Hint = 'Open/close the additional options window' - Top = 1 -- Width = 68 -+ Width = 60 - Align = alRight - AutoSize = True - Caption = 'Options' -@@ -1099,7 +1099,7 @@ - Height = 23 - Hint = 'Device or file type the video should be converted to' - Top = 20 -- Width = 619 -+ Width = 590 - Align = alTop - BorderSpacing.Left = 13 - ItemHeight = 15 -@@ -1114,7 +1114,7 @@ - Height = 23 - Hint = 'Specific settings to use for the chosen device or file type' - Top = 61 -- Width = 619 -+ Width = 590 - Align = alTop - BorderSpacing.Left = 13 - ItemHeight = 15 -@@ -1152,7 +1152,7 @@ - Height = 33 - Hint = 'Target location for the final video (choose a different folder than the source folder)' - Top = 18 -- Width = 508 -+ Width = 450 - Align = alClient - BorderSpacing.Left = 13 - BorderSpacing.Right = 5 -@@ -1161,8 +1161,9 @@ - end - object ChooseFolderBtn: TButton - AnchorSideLeft.Side = asrBottom -- Left = 526 -+ Left = 500 - Height = 33 -+ Hint = 'Choose the destination folder for the converted media' - Top = 18 - Width = 43 - Align = alRight -@@ -1176,6 +1177,7 @@ - AnchorSideLeft.Side = asrBottom - Left = 569 - Height = 33 -+ Hint = 'Open the folder containing the finished converted media' - Top = 18 - Width = 63 - Align = alRight -@@ -2096,7 +2098,7 @@ - Height = 23 - Hint = '<hh:mm:ss> - Seek to this position before start converting' - Top = 35 -- Width = 39 -+ Width = 62 - BorderSpacing.Top = 10 - OnChange = AllowChanges - TabOrder = 0 -@@ -2110,7 +2112,7 @@ - Height = 23 - Hint = '<hh:mm:ss> - Seek to this position before start converting' - Top = 35 -- Width = 41 -+ Width = 62 - BorderSpacing.Left = 10 - BorderSpacing.Top = 10 - MaxValue = 59 -@@ -2126,7 +2128,7 @@ - Height = 23 - Hint = '<hh:mm:ss> - Seek to this position before start converting' - Top = 35 -- Width = 42 -+ Width = 62 - BorderSpacing.Left = 10 - BorderSpacing.Top = 10 - MaxValue = 59 -@@ -2141,7 +2143,7 @@ - Height = 23 - Hint = '<hh:mm:ss> - Stop after this much of video converted' - Top = 68 -- Width = 39 -+ Width = 62 - BorderSpacing.Top = 10 - OnChange = AllowChanges - TabOrder = 3 -@@ -2155,7 +2157,7 @@ - Height = 23 - Hint = '<hh:mm:ss> - Stop after this much of video converted' - Top = 68 -- Width = 41 -+ Width = 62 - BorderSpacing.Left = 10 - BorderSpacing.Top = 10 - MaxValue = 59 -@@ -2171,7 +2173,7 @@ - Height = 23 - Hint = '<hh:mm:ss> - Stop after this much of video converted' - Top = 68 -- Width = 42 -+ Width = 62 - BorderSpacing.Left = 10 - BorderSpacing.Top = 10 - MaxValue = 59 -@@ -2205,7 +2207,7 @@ - Width = 627 - Align = alClient - AutoSize = True -- BorderSpacing.Left = 5 -+ BorderSpacing.Left = 3 - BevelOuter = bvNone - ClientHeight = 183 - ClientWidth = 627 -@@ -2215,7 +2217,7 @@ - Left = 11 - Height = 15 - Top = 3 -- Width = 202 -+ Width = 190 - BorderSpacing.Top = 3 - Caption = 'Additional Command Line Parameters' - ParentColor = False -@@ -2227,27 +2229,27 @@ - AnchorSideRight.Control = Panel8 - AnchorSideRight.Side = asrBottom - Left = 0 -- Height = 23 -- Top = 21 -+ Height = 15 -+ Top = 33 - Width = 627 - Anchors = [akTop, akLeft, akRight] -- BorderSpacing.Top = 3 -+ BorderSpacing.Top = 5 - OnChange = AllowChanges - TabOrder = 0 - end - object Label5: TLabel - Left = 4 -- Height = 15 -- Top = 55 -- Width = 41 -+ Height = 25 -+ Top = 75 -+ Width = 46 - Caption = '1st Pass' - ParentColor = False - end - object memFirstPass: TMemo - Left = 55 -- Height = 63 -- Top = 50 -- Width = 569 -+ Height = 60 -+ Top = 70 -+ Width = 530 - Anchors = [akTop, akLeft, akRight] - OnChange = AllowChanges - ScrollBars = ssAutoBoth -@@ -2256,8 +2258,8 @@ - object MemSecondPass: TMemo - Left = 55 - Height = 60 -- Top = 114 -- Width = 569 -+ Top = 130 -+ Width = 530 - Anchors = [akTop, akLeft, akRight] - OnChange = AllowChanges - ScrollBars = ssAutoBoth -@@ -2266,7 +2268,7 @@ - object Label6: TLabel - Left = 0 - Height = 15 -- Top = 114 -+ Top = 135 - Width = 46 - Caption = '2nd Pass' - ParentColor = False -@@ -2288,37 +2290,39 @@ - TabOrder = 1 - Visible = False - object lblSaveChanges: TLabel -- Left = 481 -+ Left = 453 - Height = 15 - Hint = 'Click here to apply settings changes to the file conversion above' - Top = -2 - Width = 80 - Anchors = [akTop, akRight] -- Caption = 'Apply Changes' -+ Caption = 'Apply_Changes' - Color = clBtnFace - ParentColor = False - Transparent = False - OnClick = lblSaveChangesClick - end - object lblCancelChanges: TLabel -- Left = 385 -+ Left = 333 - Height = 15 -+ Hint = 'Click here to cancel changes to the file conversion above' - Top = -2 - Width = 85 - Anchors = [akTop, akRight] -- Caption = 'Cancel Changes' -+ Caption = 'Cancel_Changes' - Color = clBtnFace - ParentColor = False - Transparent = False - OnClick = lblCancelChangesClick - end - object lblApplytoAll: TLabel -- Left = 569 -+ Left = 563 - Height = 15 -+ Hint = 'Click here to apply settings changes to all the file conversions above' - Top = -2 - Width = 62 - Anchors = [akTop, akRight] -- Caption = 'Apply to All' -+ Caption = 'Apply_to_All' - Color = clBtnFace - ParentColor = False - Transparent = False diff --git a/multimedia/winff/patches/unit1_pas.patch b/multimedia/winff/patches/unit1_pas.patch deleted file mode 100644 index cb68d03a3c..0000000000 --- a/multimedia/winff/patches/unit1_pas.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- unit1.pas 2022-09-03 11:44:10.000000000 +0530 -+++ unit1.pas 2022-09-18 21:46:23.128973768 +0530 -@@ -2,7 +2,7 @@ - - // WInFF 1.0 Copyright 2006-2012 Matthew Weatherford - // WinFF 1.3.2 Copyright 2011 Alexey Osipov <lion-simba@pridelands.ru> --// http://winff.org -+// https://github.com/WinFF/winff - // Licensed under the GPL v3 or any later version - // - // This program is free software: you can redistribute it and/or modify -@@ -1390,10 +1390,12 @@ - begin - {$ifdef linux} - s:=''; -+ if fileexists('/usr/bin/okular') then s:='/usr/bin/okular'; - if fileexists('/usr/bin/evince') then s:='/usr/bin/evince'; - if fileexists('/usr/bin/kpdf') then s:='/usr/bin/kpdf'; - if fileexists('/usr/bin/xpdf') then s:='/usr/bin/xpdf'; - if fileexists('/usr/bin/acroread') then s:='/usr/bin/acroread'; -+ if fileexists('/usr/bin/xdg-open') then s:='/usr/bin/xdg-open'; - if s='' then - begin - Showmessage('More information can be found at ' + pdffile); -@@ -1984,16 +1986,16 @@ - language:=leftstr(lang,2); - {$ifdef linux} - s :=''; -- if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/doc/winff/WinFF.' + language + '.pdf.gz'; -- if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf') then s:='/usr/share/doc/winff/WinFF.' + language + '.pdf'; -+ if fileexists('/usr/doc/winff-20220903_8e4491b/WinFF.' + language + '.pdf.gz') then s:='/usr/doc/winff-20220903_8e4491b/WinFF.' + language + '.pdf.gz'; -+ if fileexists('/usr/doc/winff-20220903_8e4491b/WinFF.' + language + '.pdf') then s:='/usr/doc/winff-20220903_8e4491b/WinFF.' + language + '.pdf'; - if fileexists('/usr/share/winff/WinFF.' + language + '.pdf') then s:='/usr/share/winff/WinFF.' + language + '.pdf'; - if fileexists('/usr/share/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/winff/WinFF.' + language + '.pdf.gz'; - if fileexists('/usr/share/doc/packages/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/doc/packages/winff/WinFF.' + language + '.pdf.gz'; - if fileexists('/usr/share/doc/packages/winff/WinFF.' + language + '.pdf') then s:='/usr/share/doc/packages/winff/WinFF.' + language + '.pdf'; - if s='' then - begin -- s := '/usr/share/doc/winff/WinFF.en.pdf.gz'; -- if fileexists('/usr/share/doc/winff/WinFF.en.pdf') then s:='/usr/share/doc/winff/WinFF.en.pdf'; -+ s := '/usr/doc/winff-20220903_8e4491b/WinFF.en.pdf.gz'; -+ if fileexists('/usr/doc/winff-20220903_8e4491b/WinFF.en.pdf') then s:='/usr/doc/winff-20220903_8e4491b/WinFF.en.pdf'; - if fileexists('/usr/share/winff/WinFF.en.pdf') then s:='/usr/share/winff/WinFF.en.pdf'; - if fileexists('/usr/share/winff/WinFF.en.pdf.gz') then s:='/usr/share/winff/WinFF.en.pdf.gz'; - if fileexists('/usr/share/doc/packages/winff/WinFF.en.pdf.gz') then s:='/usr/share/doc/packages/winff/WinFF.en.pdf.gz'; -@@ -2011,7 +2013,7 @@ - procedure TfrmMain.mitForumsClick(Sender: TObject); - - begin -- launchbrowser('http://www.winff.org/forums/'); -+ launchbrowser('http://github.com/WinFF/winff/issues'); - end; - - procedure TfrmMain.mitRestoreDefaultsClick(Sender: TObject); -@@ -2110,7 +2112,7 @@ - procedure TfrmMain.mitWinffClick(Sender: TObject); - - begin -- launchbrowser('http://www.winff.org/'); -+ launchbrowser('https://github.com/WinFF/winff'); - end; - - // menu: about diff --git a/multimedia/winff/patches/unit2-pas.patch b/multimedia/winff/patches/unit2-pas.patch new file mode 100644 index 0000000000..7addd19cb0 --- /dev/null +++ b/multimedia/winff/patches/unit2-pas.patch @@ -0,0 +1,13 @@ +--- unit2.pas 2023-10-03 19:20:47.000000000 +0530 ++++ unit2n.pas 2024-01-10 22:27:47.257969107 +0530 +@@ -1,8 +1,8 @@ + unit Unit2; + +-// WinFF Copyright 2006-2012 Matthew Weatherford ++// WinFF Copyright 2006-2024 Matthew Weatherford + // WinFF 1.3.2 Copyright 2011 Alexey Osipov <lion-simba@pridelands.ru> +-// http://winff.org ++// hhttps://github.com/WinFF/winff + // Licensed under the GPL v3 or any later version + // + // This program is free software: you can redistribute it and/or modify diff --git a/multimedia/winff/patches/unit3-lfm.patch b/multimedia/winff/patches/unit3-lfm.patch new file mode 100644 index 0000000000..29e8045a1c --- /dev/null +++ b/multimedia/winff/patches/unit3-lfm.patch @@ -0,0 +1,58 @@ +--- unit3.lfm 2023-10-03 19:20:47.000000000 +0530 ++++ unit3n.lfm 2024-01-11 20:09:24.951994073 +0530 +@@ -341,7 +341,9 @@ + BorderSpacing.Top = 2
+ BorderSpacing.Bottom = 2
+ Caption = 'Trademark Fabrice Bellard'
++ Font.Color = clBlue
+ ParentColor = False
++ ParentFont = False
+ OnClick = lblBellardClick
+ end
+ object lblURLffmpeg: TLabel
+@@ -354,18 +356,21 @@ + BorderSpacing.Left = 5
+ BorderSpacing.Top = 2
+ BorderSpacing.Bottom = 5
+- Caption = 'http://ffmpeg.org'
++ Caption = 'https://ffmpeg.org'
+ Font.Color = clBlue
+ ParentColor = False
+ ParentFont = False
+ OnClick = lblURLffmpegClick
+ end
+ object lblWindowsBuilds: TLabel
+- Left = 0
+- Height = 20
+- Top = 69
++ Left = 5
++ Height = 25
++ Top = 75
+ Width = 376
+ Align = alTop
++ BorderSpacing.Left = 5
++ BorderSpacing.Top = 2
++ BorderSpacing.Bottom = 5
+ Caption = 'Windows Builds by'
+ ParentColor = False
+ ShowAccelChar = False
+@@ -373,12 +378,15 @@ + end
+ object lblwinbuilds: TLabel
+ Cursor = crHandPoint
+- Left = 0
+- Height = 16
+- Top = 89
++ Left = 5
++ Height = 30
++ Top = 95
+ Width = 376
+ Align = alTop
+- Caption = 'Kyle Schwarz'
++ BorderSpacing.Left = 5
++ BorderSpacing.Top = 2
++ BorderSpacing.Bottom = 7
++ Caption = 'Gyan Doshi'
+ Font.CharSet = ANSI_CHARSET
+ Font.Color = clBlue
+ Font.Height = -13
diff --git a/multimedia/winff/patches/unit3-pas.patch b/multimedia/winff/patches/unit3-pas.patch new file mode 100644 index 0000000000..5f8dd7c238 --- /dev/null +++ b/multimedia/winff/patches/unit3-pas.patch @@ -0,0 +1,78 @@ +--- unit3.pas 2024-04-17 01:41:03.000000000 +0530 ++++ unit3n.pas 2024-04-25 17:30:56.674161644 +0530 +@@ -2,9 +2,9 @@ + + // About form + +-// WInFF 1.0 Copyright 2006-2013 Matthew Weatherford ++// WInFF 1.0 Copyright 2006-2024 Matthew Weatherford + // WinFF 1.3.2 Copyright 2011 Alexey Osipov <lion-simba@pridelands.ru> +-// http://winff.org ++// https://github.com/WinFF/winff + // Licensed under the GPL v3 or any later version + + // This program is free software: you can redistribute it and/or modify +@@ -60,7 +60,6 @@ + procedure lblBellardClick(Sender: TObject); + procedure lblGeversClick(Sender: TObject); + procedure lblStoffbergClick(Sender: TObject); +- procedure lblGmaqClick(Sender: TObject); + procedure lblURLZeranoClick(Sender: TObject); + procedure lblWeatherfordClick(Sender: TObject); + procedure lblURLWinffOrgClick(Sender: TObject); +@@ -128,27 +127,22 @@ + + procedure TfrmAbout.lblBellardClick(Sender: TObject); + begin +- ++ frmMain.LaunchBrowser('https://bellard.org/'); + end; + + procedure TfrmAbout.lblGeversClick(Sender: TObject); + begin +- frmMain.LaunchBrowser('https://launchpad.net/~paul-climbing/+archive/ppa/'); ++ frmMain.LaunchBrowser('https://tracker.debian.org/pkg/winff'); + end; + + procedure TfrmAbout.lblStoffbergClick(Sender: TObject); + begin +- frmMain.LaunchBrowser('http://istoff.blogspot.com'); +-end; +- +-procedure TfrmAbout.lblGmaqClick(Sender: TObject); +-begin +- frmMain.LaunchBrowser('http://www.bandshed.net/'); ++ frmMain.LaunchBrowser('https://istoff.blogspot.com'); + end; + + procedure TfrmAbout.lblURLZeranoClick(Sender: TObject); + begin +- frmMain.LaunchBrowser('http://ffmpeg.zeranoe.com'); ++ frmMain.LaunchBrowser('https://www.gyan.dev/ffmpeg/builds'); + end; + + procedure TfrmAbout.btnOkClick(Sender: TObject); +@@ -158,7 +152,7 @@ + + procedure TfrmAbout.lblWeatherfordClick(Sender: TObject); + begin +- frmMain.LaunchBrowser('http://www.biggmatt.com'); ++ frmMain.LaunchBrowser('https://github.com/WinFF/winff'); + end; + + procedure TfrmAbout.lblURLWinffOrgClick(Sender: TObject); +@@ -168,12 +162,12 @@ + + procedure TfrmAbout.lblURLffmpegClick(Sender: TObject); + begin +- frmMain.LaunchBrowser('http://ffmpeg.org/'); ++ frmMain.LaunchBrowser('https://ffmpeg.org/'); + end; + + procedure TfrmAbout.lblwinbuildsClick(Sender: TObject); + begin +- frmMain.LaunchBrowser('http://ffmpeg.zeranoe.com/builds/'); ++ frmMain.LaunchBrowser('https://www.gyan.dev/ffmpeg/builds'); + end; + + procedure TfrmAbout.lblWindowsBuildsClick(Sender: TObject); diff --git a/multimedia/winff/patches/unit3_lfm.patch b/multimedia/winff/patches/unit3_lfm.patch deleted file mode 100644 index a2b13b77ce..0000000000 --- a/multimedia/winff/patches/unit3_lfm.patch +++ /dev/null @@ -1,124 +0,0 @@ ---- winff-1/winff/unit3.lfm 2022-09-03 11:44:10.000000000 +0530 -+++ winff-2/winff/unit3.lfm 2022-09-24 15:47:28.210972357 +0530 -@@ -1,12 +1,12 @@ - object frmAbout: TfrmAbout
- Left = 323
-- Height = 300
-+ Height = 325
- Top = 212
- Width = 384
- BorderIcons = [biSystemMenu]
- BorderStyle = bsDialog
- Caption = 'About WinFF'
-- ClientHeight = 300
-+ ClientHeight = 350
- ClientWidth = 384
- Color = clForm
- Constraints.MinHeight = 300
-@@ -144,8 +144,8 @@ - object lblGevers: TLabel
- Cursor = crHandPoint
- Left = 4
-- Height = 20
-- Top = 136
-+ Height = 25
-+ Top = 140
- Width = 372
- Align = alTop
- BorderSpacing.Left = 4
-@@ -188,11 +188,11 @@ - AnchorSideTop.Side = asrBottom
- Cursor = crHandPoint
- Left = 57
-- Height = 20
-- Top = 29
-+ Height = 25
-+ Top = 33
- Width = 137
- BorderSpacing.Around = 5
-- Caption = 'http://www.winff.org'
-+ Caption = 'https://github.com/WinFF/winff'
- Font.Color = clBlue
- ParentColor = False
- ParentFont = False
-@@ -303,8 +303,8 @@ - object lblStoffberg: TLabel
- Cursor = crHandPoint
- Left = 4
-- Height = 20
-- Top = 116
-+ Height = 25
-+ Top = 120
- Width = 372
- Align = alTop
- BorderSpacing.Left = 4
-@@ -322,7 +322,7 @@ - ClientWidth = 376
- object lblFFmeg: TLabel
- Left = 5
-- Height = 20
-+ Height = 25
- Top = 0
- Width = 371
- Align = alTop
-@@ -347,25 +347,28 @@ - object lblURLffmpeg: TLabel
- Cursor = crHandPoint
- Left = 5
-- Height = 20
-- Top = 44
-+ Height = 25
-+ Top = 45
- Width = 371
- Align = alTop
- BorderSpacing.Left = 5
- BorderSpacing.Top = 2
- BorderSpacing.Bottom = 5
-- Caption = 'http://ffmpeg.org'
-+ Caption = 'https://ffmpeg.org'
- Font.Color = clBlue
- ParentColor = False
- ParentFont = False
- OnClick = lblURLffmpegClick
- end
- object lblWindowsBuilds: TLabel
-- Left = 0
-- Height = 20
-- Top = 69
-+ Left = 5
-+ Height = 25
-+ Top = 75
- Width = 376
- Align = alTop
-+ BorderSpacing.Left = 5
-+ BorderSpacing.Top = 2
-+ BorderSpacing.Bottom = 5
- Caption = 'Windows Builds by'
- ParentColor = False
- ShowAccelChar = False
-@@ -373,18 +376,16 @@ - end
- object lblwinbuilds: TLabel
- Cursor = crHandPoint
-- Left = 0
-- Height = 16
-- Top = 89
-+ Left = 5
-+ Height = 30
-+ Top = 95
- Width = 376
- Align = alTop
-- Caption = 'Kyle Schwarz'
-- Font.CharSet = ANSI_CHARSET
-+ BorderSpacing.Left = 5
-+ BorderSpacing.Top = 2
-+ BorderSpacing.Bottom = 7
-+ Caption = 'Gyan Doshi'
- Font.Color = clBlue
-- Font.Height = -13
-- Font.Name = 'Arial'
-- Font.Pitch = fpVariable
-- Font.Quality = fqDraft
- ParentColor = False
- ParentFont = False
- OnClick = lblwinbuildsClick
diff --git a/multimedia/winff/patches/unit3_pas.patch b/multimedia/winff/patches/unit3_pas.patch deleted file mode 100644 index 5a36cc91de..0000000000 --- a/multimedia/winff/patches/unit3_pas.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- winff-1/winff/unit3.pas 2022-09-03 11:44:10.000000000 +0530 -+++ winff-2/winff/unit3.pas 2022-09-24 16:04:02.473969501 +0530 -@@ -2,7 +2,7 @@ - - // WInFF 1.0 Copyright 2006-2013 Matthew Weatherford - // WinFF 1.3.2 Copyright 2011 Alexey Osipov <lion-simba@pridelands.ru> --// http://winff.org -+// https://github.com/WinFF/winff - // Licensed under the GPL v3 or any later version - // - // This program is free software: you can redistribute it and/or modify -@@ -62,7 +62,6 @@ - procedure lblBellardClick(Sender: TObject); - procedure lblGeversClick(Sender: TObject); - procedure lblStoffbergClick(Sender: TObject); -- procedure lblGmaqClick(Sender: TObject); - procedure lblURLZeranoClick(Sender: TObject); - procedure lblWeatherfordClick(Sender: TObject); - procedure lblURLWinffOrgClick(Sender: TObject); -@@ -126,7 +125,7 @@ - lbThanks.items.add(rsLaunchpadContrib); - - frmAbout.lblWinff.Caption := StringReplace(frmAbout.lblWinff.Caption, '%s', '1.5.5',[]); -- frmAbout.lblCopyright.Caption := StringReplace(frmAbout.lblCopyright.Caption, '%s', '2006-2016',[]); -+ frmAbout.lblCopyright.Caption := StringReplace(frmAbout.lblCopyright.Caption, '%s', '2006-2022',[]); - end; - - procedure TfrmAbout.lblBellardClick(Sender: TObject); -@@ -136,22 +135,17 @@ - - procedure TfrmAbout.lblGeversClick(Sender: TObject); - begin -- frmMain.LaunchBrowser('https://launchpad.net/~paul-climbing/+archive/ppa/'); -+ frmMain.LaunchBrowser('https://tracker.debian.org/pkg/winff'); - end; - - procedure TfrmAbout.lblStoffbergClick(Sender: TObject); - begin --frmMain.LaunchBrowser('http://istoff.blogspot.com'); --end; -- --procedure TfrmAbout.lblGmaqClick(Sender: TObject); --begin -- frmMain.LaunchBrowser('http://www.bandshed.net/'); -+frmMain.LaunchBrowser('https://istoff.blogspot.com'); - end; - - procedure TfrmAbout.lblURLZeranoClick(Sender: TObject); - begin -- frmMain.LaunchBrowser('http://ffmpeg.zeranoe.com'); -+ frmMain.LaunchBrowser('https://www.gyan.dev/ffmpeg/'); - end; - - procedure TfrmAbout.btnOkClick(Sender: TObject); -@@ -161,22 +155,22 @@ - - procedure TfrmAbout.lblWeatherfordClick(Sender: TObject); - begin -- frmMain.LaunchBrowser('http://www.biggmatt.com'); -+ frmMain.LaunchBrowser('https://www.biggmatt.com/p/winff.html'); - end; - - procedure TfrmAbout.lblURLWinffOrgClick(Sender: TObject); - begin -- frmMain.LaunchBrowser('http://www.winff.org'); -+ frmMain.LaunchBrowser('https://github.com/WinFF/winff'); - end; - - procedure TfrmAbout.lblURLffmpegClick(Sender: TObject); - begin -- frmMain.LaunchBrowser('http://ffmpeg.org/'); -+ frmMain.LaunchBrowser('https://ffmpeg.org/'); - end; - - procedure TfrmAbout.lblwinbuildsClick(Sender: TObject); - begin -- frmMain.LaunchBrowser('http://ffmpeg.zeranoe.com/builds/'); -+ frmMain.LaunchBrowser('https://www.gyan.dev/ffmpeg/builds/'); - end; - - procedure TfrmAbout.lblWindowsBuildsClick(Sender: TObject); diff --git a/multimedia/winff/patches/unit4_pas.patch b/multimedia/winff/patches/unit4-pas.patch index 82d8c55aff..c375713c30 100644 --- a/multimedia/winff/patches/unit4_pas.patch +++ b/multimedia/winff/patches/unit4-pas.patch @@ -1,8 +1,10 @@ ---- unit4.pas 2022-09-03 11:44:10.000000000 +0530 -+++ unit4.pas 2022-09-18 21:21:08.879978117 +0530 -@@ -2,7 +2,7 @@ +--- unit4.pas 2023-10-03 19:20:47.000000000 +0530 ++++ unit4n.pas 2024-01-10 22:36:28.191304129 +0530 +@@ -1,8 +1,8 @@ + unit Unit4; - // WInFF 1.0 Copyright 2006-2009 Matthew Weatherford +-// WInFF 1.0 Copyright 2006-2009 Matthew Weatherford ++// WInFF 1.0 Copyright 2006-2024 Matthew Weatherford // WinFF 1.3.2 Copyright 2011 Alexey Osipov <lion-simba@pridelands.ru> -// http://winff.org +// https://github.com/WinFF/winff diff --git a/multimedia/winff/patches/unit2_pas.patch b/multimedia/winff/patches/unit5-pas.patch index b47c41de75..b9d25f828e 100644 --- a/multimedia/winff/patches/unit2_pas.patch +++ b/multimedia/winff/patches/unit5-pas.patch @@ -1,8 +1,10 @@ ---- unit2.pas 2022-09-03 11:44:10.000000000 +0530 -+++ unit2.pas 2022-09-18 20:46:51.427984026 +0530 -@@ -2,7 +2,7 @@ +--- unit5.pas 2023-10-03 19:20:47.000000000 +0530 ++++ unit5n.pas 2024-01-10 22:37:47.134755906 +0530 +@@ -1,8 +1,8 @@ + unit Unit5; - // WinFF Copyright 2006-2012 Matthew Weatherford +-// WInFF 1.0 Copyright 2006-2009 Matthew Weatherford ++// WInFF 1.0 Copyright 2006-2024 Matthew Weatherford // WinFF 1.3.2 Copyright 2011 Alexey Osipov <lion-simba@pridelands.ru> -// http://winff.org +// https://github.com/WinFF/winff diff --git a/multimedia/winff/patches/unit5_pas.patch b/multimedia/winff/patches/unit6-pas.patch index 3614c8b2f0..dfe5700f9f 100644 --- a/multimedia/winff/patches/unit5_pas.patch +++ b/multimedia/winff/patches/unit6-pas.patch @@ -1,8 +1,10 @@ ---- unit5.pas 2022-09-03 11:44:10.000000000 +0530 -+++ unit5.pas 2022-09-18 21:22:49.145977829 +0530 -@@ -2,7 +2,7 @@ +--- unit6.pas 2023-10-03 19:20:47.000000000 +0530 ++++ unit6n.pas 2024-01-10 22:38:34.727540276 +0530 +@@ -1,8 +1,8 @@ + unit unit6; - // WInFF 1.0 Copyright 2006-2009 Matthew Weatherford +-// WInFF 1.0 Copyright 2006-2009 Matthew Weatherford ++// WInFF 1.0 Copyright 2006-2024 Matthew Weatherford // WinFF 1.3.2 Copyright 2011 Alexey Osipov <lion-simba@pridelands.ru> -// http://winff.org +// https://github.com/WinFF/winff diff --git a/multimedia/winff/patches/unit6_pas.patch b/multimedia/winff/patches/unit6_pas.patch deleted file mode 100644 index 9cc9df6d02..0000000000 --- a/multimedia/winff/patches/unit6_pas.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- unit6.pas 2022-09-03 11:44:10.000000000 +0530 -+++ unit6.pas 2022-09-18 21:24:18.544977572 +0530 -@@ -2,7 +2,7 @@ - - // WInFF 1.0 Copyright 2006-2009 Matthew Weatherford - // WinFF 1.3.2 Copyright 2011 Alexey Osipov <lion-simba@pridelands.ru> --// http://winff.org -+// https://github.com/WinFF/winff - // Licensed under the GPL v3 or any later version - // - // This program is free software: you can redistribute it and/or modify diff --git a/multimedia/winff/patches/winff-1.patch b/multimedia/winff/patches/winff-1.patch new file mode 100644 index 0000000000..e4a97761e6 --- /dev/null +++ b/multimedia/winff/patches/winff-1.patch @@ -0,0 +1,17 @@ +--- winff.1 2023-10-03 19:20:47.000000000 +0530 ++++ winffn.1 2024-01-11 20:22:53.045991752 +0530 +@@ -29,6 +29,7 @@ + .SH "SEE ALSO" + .PP + For more details, you should have a look at the pdf manual, available at /usr/share/doc/winff/winff\.pdf ++In Slackware Linux the Manual is available at /usr/doc/winff-20231003_31b79e3/winff\.pdf + .SH "AUTHOR" + .PP + This manual page was written by Paul Gevers +@@ -41,5 +42,5 @@ + .PP + On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL\. + .SH "COPYRIGHT" +-Copyright \(co 2008 Paul Gevers ++Copyright \(co 2008-2024 Paul Gevers + .br diff --git a/multimedia/winff/patches/winff_en_GB_po.patch b/multimedia/winff/patches/winff-en.patch index 2fe16e0801..1eccc92691 100644 --- a/multimedia/winff/patches/winff_en_GB_po.patch +++ b/multimedia/winff/patches/winff-en.patch @@ -1,5 +1,5 @@ ---- winff-1/winff/languages/winff.en_GB.po 2022-09-03 11:44:10.000000000 +0530 -+++ winff-2/winff/languages/winff.en_GB.po 2022-09-22 15:45:52.312998805 +0530 +--- winff.en_GB.po 2023-10-03 19:20:47.000000000 +0530 ++++ winff.en_GBn.po 2024-01-10 22:50:33.016503273 +0530 @@ -73,8 +73,8 @@ #: tfrmabout.lblschwarz.caption @@ -35,35 +35,3 @@ #: tfrmabout.lblweatherford.caption msgid "Matthew Weatherford" -@@ -502,16 +502,16 @@ - msgstr "X" - - #: tfrmmain.lblapplytoall.caption --msgid "Apply to All" --msgstr "" -+msgid "Apply_to_All" -+msgstr "Apply_to_All" - - #: tfrmmain.lblaspectratio.caption - msgid "Aspect Ratio" - msgstr "Aspect Ratio" - - #: tfrmmain.lblcancelchanges.caption --msgid "Cancel Changes" --msgstr "Cancel Changes" -+msgid "Cancel_Changes" -+msgstr "Cancel_Changes" - - #: tfrmmain.lblcropbottom.caption - msgid "Bottom" -@@ -538,8 +538,8 @@ - msgstr "" - - #: tfrmmain.lblsavechanges.caption --msgid "Apply Changes" --msgstr "Apply Changes" -+msgid "Apply_Changes" -+msgstr "Apply_Changes" - - #: tfrmmain.lblsavechanges.hint - msgid "Click here to apply settings changes to the file conversion above" diff --git a/multimedia/winff/patches/winff-lpi.patch b/multimedia/winff/patches/winff-lpi.patch new file mode 100644 index 0000000000..5c606b7ec4 --- /dev/null +++ b/multimedia/winff/patches/winff-lpi.patch @@ -0,0 +1,20 @@ +--- winff.lpi 2024-04-17 01:41:03.000000000 +0530 ++++ winffn.lpi 2024-04-25 17:33:23.998161221 +0530 +@@ -20,7 +20,7 @@ + <MajorVersionNr Value="1"/> + <MinorVersionNr Value="6"/> + <RevisionNr Value="0"/> +- <StringTable CompanyName="WinFF.org" FileDescription="WinFF Video Converter" InternalName="winff" LegalCopyright="Copyright 2006-2023 Matthew Weatherford" OriginalFilename="winff.exe" ProductVersion=""/> ++ <StringTable CompanyName="WinFF.org" FileDescription="WinFF Video Converter" InternalName="winff" LegalCopyright="Copyright 2006-2024 Matthew Weatherford" OriginalFilename="winff.exe" ProductVersion=""/> + </VersionInfo> + <BuildModes Count="1"> + <Item1 Name="default" Default="True"/> +@@ -129,7 +129,7 @@ + </Debugging> + <Options> + <PassLinkerOptions Value="True"/> +- <LinkerOptions Value="--as-needed -zrelro -znow"/> ++ <LinkerOptions Value="--as-needed -zrelro -znow -zdefs -pie"/> + <Win32> + <GraphicApplication Value="True"/> + </Win32> diff --git a/multimedia/winff/patches/winff_lpr.patch b/multimedia/winff/patches/winff-lpr.patch index c506f8aa1f..6344dba0ab 100644 --- a/multimedia/winff/patches/winff_lpr.patch +++ b/multimedia/winff/patches/winff-lpr.patch @@ -1,10 +1,11 @@ ---- winff.lpr 2022-09-03 11:44:10.000000000 +0530 -+++ winff.lpr 2022-09-18 21:33:05.256976060 +0530 +--- winff.lpr 2023-10-03 19:20:47.000000000 +0530 ++++ winffn.lpr 2024-01-10 22:48:22.389222629 +0530 @@ -1,7 +1,7 @@ program winff; - // WInFF 1.0 Copyright 2006-2009 Matthew Weatherford +-// WInFF 1.0 Copyright 2006-2009 Matthew Weatherford -// http://winff.org ++// WInFF 1.0 Copyright 2006-2024 Matthew Weatherford +// https://github.com/WinFF/winff // Licensed under the GPL v3 or any later version // diff --git a/multimedia/winff/patches/winff_po.patch b/multimedia/winff/patches/winff-po.patch index 24a23c4c6f..075eae8d18 100644 --- a/multimedia/winff/patches/winff_po.patch +++ b/multimedia/winff/patches/winff-po.patch @@ -1,5 +1,5 @@ ---- winff-1/winff/languages/winff.po 2022-09-03 11:44:10.000000000 +0530 -+++ winff-2/winff/languages/winff.po 2022-09-19 21:35:32.946987563 +0530 +--- winff.po 2023-10-03 19:20:47.000000000 +0530 ++++ winffn.po 2024-01-10 22:53:57.565726188 +0530 @@ -69,7 +69,7 @@ #: tfrmabout.lblschwarz.caption @@ -29,30 +29,3 @@ msgstr "" #: tfrmabout.lblweatherford.caption -@@ -476,7 +476,7 @@ - msgstr "" - - #: tfrmmain.lblapplytoall.caption --msgid "Apply to All" -+msgid "Apply_to_All" - msgstr "" - - #: tfrmmain.lblaspectratio.caption -@@ -484,7 +484,7 @@ - msgstr "" - - #: tfrmmain.lblcancelchanges.caption --msgid "Cancel Changes" -+msgid "Cancel_Changes" - msgstr "" - - #: tfrmmain.lblcropbottom.caption -@@ -512,7 +512,7 @@ - msgstr "" - - #: tfrmmain.lblsavechanges.caption --msgid "Apply Changes" -+msgid "Apply_Changes" - msgstr "" - - #: tfrmmain.lblsavechanges.hint diff --git a/multimedia/winff/patches/winff_pot.patch b/multimedia/winff/patches/winff-pot.patch index aade91be2e..da2e826656 100644 --- a/multimedia/winff/patches/winff_pot.patch +++ b/multimedia/winff/patches/winff-pot.patch @@ -1,5 +1,5 @@ ---- winff-1/winff/languages/winff.pot 2022-09-03 11:44:10.000000000 +0530 -+++ winff-2/winff/languages/winff.pot 2022-09-19 21:43:46.489986146 +0530 +--- winff.pot 2023-10-03 19:20:47.000000000 +0530 ++++ winffn.pot 2024-01-10 22:52:29.128529940 +0530 @@ -69,7 +69,7 @@ #: tfrmabout.lblschwarz.caption @@ -29,30 +29,3 @@ msgstr "" #: tfrmabout.lblweatherford.caption -@@ -476,7 +476,7 @@ - msgstr "" - - #: tfrmmain.lblapplytoall.caption --msgid "Apply to All" -+msgid "Apply_to_All" - msgstr "" - - #: tfrmmain.lblaspectratio.caption -@@ -484,7 +484,7 @@ - msgstr "" - - #: tfrmmain.lblcancelchanges.caption --msgid "Cancel Changes" -+msgid "Cancel_Changes" - msgstr "" - - #: tfrmmain.lblcropbottom.caption -@@ -512,7 +512,7 @@ - msgstr "" - - #: tfrmmain.lblsavechanges.caption --msgid "Apply Changes" -+msgid "Apply_Changes" - msgstr "" - - #: tfrmmain.lblsavechanges.hint diff --git a/multimedia/winff/patches/winff_1.patch b/multimedia/winff/patches/winff_1.patch deleted file mode 100644 index 3d30a7574e..0000000000 --- a/multimedia/winff/patches/winff_1.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- winff-1/winff/winff.1 2022-09-03 11:44:10.000000000 +0530 -+++ winff-2/winff/winff.1 2022-09-22 22:28:25.665975741 +0530 -@@ -25,10 +25,11 @@ - .PP - WinFF is a graphical user interface for the command line video converter ffmpeg or avconv\. It runs ffmpeg or avconv from the command line\. So, you just pick your files and it does the rest\. - .PP --WinFF doesn\'t actually convert any video files\. It just runs ffmpeg or avconv\. Therefore, It will convert any video file that ffmpeg or avconv will convert\. Conversely, if ffmpeg or avconv will not convert the file, then WinFF will not either\. -+WinFF doesn't actually convert any video files\. It just runs ffmpeg or avconv\. Therefore, It will convert any video file that ffmpeg or avconv will convert\. Conversely, if ffmpeg or avconv will not convert the file, then WinFF will not either\. - .SH "SEE ALSO" - .PP - For more details, you should have a look at the pdf manual, available at /usr/share/doc/winff/winff\.pdf -+In Slackware the Manual is available at /usr/doc/winff\-\$\VERSION/winff\.pdf - .SH "AUTHOR" - .PP - This manual page was written by Paul Gevers diff --git a/multimedia/winff/patches/winff_lpi.patch b/multimedia/winff/patches/winff_lpi.patch deleted file mode 100644 index 3a709f7b93..0000000000 --- a/multimedia/winff/patches/winff_lpi.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- winff-1/winff/winff.lpi 2022-09-03 11:44:10.000000000 +0530 -+++ winff-2/winff/winff.lpi 2022-09-23 15:25:23.822970637 +0530 -@@ -20,7 +20,7 @@ - <MajorVersionNr Value="1"/> - <MinorVersionNr Value="5"/> - <RevisionNr Value="5"/> -- <StringTable CompanyName="WinFF.org" FileDescription="WinFF Video Converter" InternalName="winff" LegalCopyright="Copyright 2006-2016 Matthew Weatherford" OriginalFilename="winff.exe" ProductVersion=""/> -+ <StringTable CompanyName="WinFF.org" FileDescription="WinFF Video Converter" InternalName="winff" LegalCopyright="Copyright 2006-2022 Matthew Weatherford" OriginalFilename="winff.exe" ProductVersion=""/> - </VersionInfo> - <BuildModes Count="1"> - <Item1 Name="default" Default="True"/> -@@ -117,6 +117,11 @@ - <UseAnsiStrings Value="False"/> - </SyntaxOptions> - </Parsing> -+ <CodeGeneration> -+ <Optimizations> -+ <OptimizationLevel Value="2"/> -+ </Optimizations> -+ </CodeGeneration> - <Linking> - <Debugging> - <DebugInfoType Value="dsStabs"/> -@@ -124,7 +129,7 @@ - <LinkSmart Value="True"/> - <Options> - <PassLinkerOptions Value="True"/> -- <LinkerOptions Value="--as-needed"/> -+ <LinkerOptions Value="--as-needed -zrelro -znow"/> - <Win32> - <GraphicApplication Value="True"/> - </Win32> diff --git a/multimedia/winff/winff.SlackBuild b/multimedia/winff/winff.SlackBuild index 8f7b6ace10..52eb1ccfc3 100644 --- a/multimedia/winff/winff.SlackBuild +++ b/multimedia/winff/winff.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for winff # Copyright 2010 by Giovanne Castro, Campinas, Sao Paulo, Brazil <giovannefc@ig.com.br> -# Copyright 2022 Vijay Marcel +# Copyright 2022-2024 Vijay Marcel # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,12 +23,16 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20230527 bkw: modified by SlackBuilds.org: +# - fix ARCH, use separate CPU variable for the compiler. +# - grammar cleanups for README. +# - stop creating /root/.lazarus/compilertest.pas outside of $TMP. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=winff -VERSION=${VERSION:-20220903_8e4491b} -LONGNAM=${LONGNAM:-8e4491be149031916053378d859ce156cf9b43d3} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.6.4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -40,9 +44,6 @@ case "$( uname -m )" in esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -52,19 +53,17 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi +case "$ARCH" in + i?86) CPU="i386" + LIBDIRSUFFIX="" + ;; + x86_64) CPU="x86_64" + LIBDIRSUFFIX="64" + ;; + *) printf "$ARCH is not supported...\n" + exit 1 + ;; +esac set -e trap 'echo "$0 FAILED at line $LINENO!" | tee -a $OUTPUT/error-${PRGNAM}.log' ERR @@ -72,32 +71,30 @@ trap 'echo "$0 FAILED at line $LINENO!" | tee -a $OUTPUT/error-${PRGNAM}.log' E rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -rm -rf $PRGNAM-$LONGNAM -tar xvf $CWD/$PRGNAM-$LONGNAM.tar.gz -cd $PRGNAM-$LONGNAM +rm -rf $PRGNAM-$PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} + -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} + echo "Patching Winff, See README and changelog for Details" cd $PRGNAM -patch --verbose --unified < $CWD/patches/unit1_lfm.patch -patch --verbose --unified < $CWD/patches/unit1_pas.patch -patch --verbose --unified < $CWD/patches/unit2_pas.patch -patch --verbose --unified < $CWD/patches/unit3_lfm.patch -patch --verbose --unified < $CWD/patches/unit3_pas.patch -patch --verbose --unified < $CWD/patches/unit4_pas.patch -patch --verbose --unified < $CWD/patches/unit5_pas.patch -patch --verbose --unified < $CWD/patches/unit6_pas.patch -patch --verbose --unified < $CWD/patches/winff_lpi.patch -patch --verbose --unified < $CWD/patches/winff_lpr.patch -patch --verbose --unified < $CWD/patches/winff_1.patch +patch --verbose --unified < $CWD/patches/unit1-pas.patch +patch --verbose --unified < $CWD/patches/unit2-pas.patch +patch --verbose --unified < $CWD/patches/unit3-lfm.patch +patch --verbose --unified < $CWD/patches/unit3-pas.patch +patch --verbose --unified < $CWD/patches/unit4-pas.patch +patch --verbose --unified < $CWD/patches/unit5-pas.patch +patch --verbose --unified < $CWD/patches/unit6-pas.patch +patch --verbose --unified < $CWD/patches/winff-lpi.patch +patch --verbose --unified < $CWD/patches/winff-lpr.patch +patch --verbose --unified < $CWD/patches/winff-1.patch echo "Patching the languages file" @@ -105,39 +102,44 @@ find languages -type f -not \( -name 'winff.po' -or -name 'winff.pot' -or -name cd languages -patch --verbose --unified < $CWD/patches/winff_po.patch -patch --verbose --unified < $CWD/patches/winff_pot.patch -patch --verbose --unified < $CWD/patches/winff_en_GB_po.patch +patch --verbose --unified < $CWD/patches/winff-pot.patch +patch --verbose --unified < $CWD/patches/winff-en.patch -cd ../.. +cd .. -echo "Building WinFF with QT5 Widget insted of GTK" +# Adapted from https://slackbuilds.org/slackbuilds/15.0/system/doublecmd-qt5/doublecmd-qt5.SlackBuild +# This should technically prevent lazbuild to put object code files in /usr/share/lazarus when builing +# pascal applications using lazbuild -lazbuild --lazarusdir=/usr/share/lazarus --widgetset=qt5 --cpu=$ARCH -B $TMP/$PRGNAM-$LONGNAM/$PRGNAM/winff.lpr +echo "we are now copying /usr/share/lazarus to $(pwd) to avoid putting object code files in /usr/share/lazarus when compiling winff" -install -m 0755 -D $TMP/$PRGNAM-$LONGNAM/$PRGNAM/$PRGNAM $PKG/usr/bin/$PRGNAM +cp -a /usr/share/lazarus ./ -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +echo "Building WinFF with QT5 Widget insted of GTK" + +$(pwd)/lazarus/lazbuild --lazarusdir="$(pwd)/lazarus" --widgetset=qt5 --cpu=$CPU -B winff.lpr -mkdir -pv $PKG/usr/share/winff -cp -a $TMP/$PRGNAM-$LONGNAM/$PRGNAM/languages $PKG/usr/share/winff/ -cp -a $TMP/$PRGNAM-$LONGNAM/$PRGNAM/presets.xml $PKG/usr/share/winff/ -install -m 0644 $TMP/$PRGNAM-$LONGNAM/$PRGNAM/scripts/check_presets.sh $PKG/usr/share/winff/ +install -s -m 0755 -D $TMP/$PRGNAM-$PRGNAM-$VERSION/$PRGNAM/$PRGNAM $PKG/usr/bin/$PRGNAM + +mkdir -pv $PKG/usr/share/$PRGNAM +cp -a $TMP/$PRGNAM-$PRGNAM-$VERSION/$PRGNAM/languages $PKG/usr/share/$PRGNAM/ +cp -a $TMP/$PRGNAM-$PRGNAM-$VERSION/$PRGNAM/presets.xml $PKG/usr/share/$PRGNAM/ +install -m 0644 $TMP/$PRGNAM-$PRGNAM-$VERSION/$PRGNAM/scripts/check_presets.sh $PKG/usr/share/$PRGNAM/ mkdir -pv $PKG/usr/man/man1 -gzip -c9 $TMP/$PRGNAM-$LONGNAM/$PRGNAM/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz +gzip -c9 $TMP/$PRGNAM-$PRGNAM-$VERSION/$PRGNAM/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz install -m 0644 -D $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop -install -m 0644 -D $TMP/$PRGNAM-$LONGNAM/$PRGNAM/winff-icons/48x48/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png +install -m 0644 -D $TMP/$PRGNAM-$PRGNAM-$VERSION/$PRGNAM/winff-icons/48x48/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $TMP/$PRGNAM-$LONGNAM/$PRGNAM/COPYING $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $TMP/$PRGNAM-$LONGNAM/$PRGNAM/AUTHORS $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $TMP/$PRGNAM-$LONGNAM/$PRGNAM/README-Presets.txt $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $TMP/$PRGNAM-$LONGNAM/$PRGNAM/docs/*.{pdf,txt} $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cp -a $TMP/$PRGNAM-$PRGNAM-$VERSION/$PRGNAM/COPYING $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $TMP/$PRGNAM-$PRGNAM-$VERSION/$PRGNAM/AUTHORS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $TMP/$PRGNAM-$PRGNAM-$VERSION/$PRGNAM/{README-Presets.txt,changelog.txt} $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $TMP/$PRGNAM-$PRGNAM-$VERSION/$PRGNAM/docs/*.{pdf,txt} $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $TMP/$PRGNAM-$PRGNAM-$VERSION/README.md $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -pv $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc @@ -145,3 +147,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE + diff --git a/multimedia/winff/winff.info b/multimedia/winff/winff.info index 3cee2a0174..52aaafeaf7 100644 --- a/multimedia/winff/winff.info +++ b/multimedia/winff/winff.info @@ -1,8 +1,8 @@ PRGNAM="winff" -VERSION="20220903_8e4491b" +VERSION="1.6.4" HOMEPAGE="https://github.com/WinFF/winff" -DOWNLOAD="https://github.com/WinFF/winff/archive/8e4491b/winff-8e4491be149031916053378d859ce156cf9b43d3.tar.gz" -MD5SUM="25bb9853f870c827ef80f2efba1f7219" +DOWNLOAD="https://github.com/WinFF/winff/archive/winff-1.6.4/winff-winff-1.6.4.tar.gz" +MD5SUM="23138be15b60bf3fcb1c11c634d44d16" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libqtpas lazarus" |