Re: [x264/f30: 7/7] Merge branch 'f29' into f30
by Dominik 'Rathann' Mierzejewski
On Friday, 04 October 2019 at 10:23, Nicolas Chauvet wrote:
> Please consider to use cherry-pick next time.
> I don't see the point to compute a merge resolution for the changelog
> because of a single fix.
> This is craziness.
Cherry-picking only makes sense when the branches are too diverged. I
did cherry-pick from f29 to el7 for that reason. The others are more or
less the same. All the fixes that went into all branches should have
been applied to the oldest applicable branch first and then merged
upwards. This wasn't done, hence the current merge commits look uglier
than they could be. They will be much cleaner in the future if this
workflow is followed.
Christopher over at fedora devel list has some valid points in favour of
this way[1]:
Git has excellent branch merging features. Merging branches, rather than
cherry-picking across them, results in commits representing the same
changeset being present in multiple branches, making it easier to search
git history and identify which branches contain a specific change.
Regards,
Dominik
[1] https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
--
Fedora https://getfedora.org | RPM Fusion http://rpmfusion.org
There should be a science of discontent. People need hard times and
oppression to develop psychic muscles.
-- from "Collected Sayings of Muad'Dib" by the Princess Irulan
5 days, 14 hours
RPM Fusion update report 2020-06-28
by noreply＠rpmfusion.org
RPM Fusion update report
------------------------
Section free:
-------------
Fedora 31
-------------
Pushed to testing:
chromium-browser-privacy-83.0.4103.116-1.fc31
chromium-freeworld-83.0.4103.116-1.fc31
Pushed to stable:
ffmpeg-4.2.3-4.fc31
mpv-0.32.0-6.fc31
retroarch-freeworld-1.8.9-1.fc31
telegram-desktop-2.1.13-1.fc31
Fedora 32
-------------
Pushed to testing:
chromium-browser-privacy-83.0.4103.116-1.fc32
chromium-freeworld-83.0.4103.116-1.fc32
gstreamer-0.10.36-27.fc32
Pushed to stable:
ffmpeg-4.2.3-4.fc32
mpv-0.32.0-6.fc32
qt-heif-image-plugin-0.3.3-2.fc32
retroarch-freeworld-1.8.9-1.fc32
telegram-desktop-2.1.13-1.fc32
EL 6
-------------
Pushed to testing:
Pushed to stable:
EL 7
-------------
Pushed to testing:
Pushed to stable:
EL 8
-------------
Pushed to testing:
buildsys-build-rpmfusion-30-5.el8
Pushed to stable:
ffmpeg-4.2.3-4.el8
mpv-0.32.0-6.el8
Section nonfree:
-------------
Fedora 31
-------------
Pushed to testing:
nvidia-390xx-kmod-390.138-1.fc31
nvidia-kmod-440.100-1.fc31
nvidia-modprobe-440.100-1.fc31
nvidia-persistenced-440.100-1.fc31
nvidia-settings-390xx-390.138-1.fc31
nvidia-settings-440.100-1.fc31
nvidia-xconfig-440.100-1.fc31
xorg-x11-drv-nvidia-390xx-390.138-1.fc31
xorg-x11-drv-nvidia-440.100-1.fc31
Pushed to stable:
Fedora 32
-------------
Pushed to testing:
nvidia-390xx-kmod-390.138-1.fc32
nvidia-kmod-440.100-1.fc32
nvidia-modprobe-440.100-1.fc32
nvidia-persistenced-440.100-1.fc32
nvidia-settings-390xx-390.138-1.fc32
nvidia-settings-440.100-1.fc32
nvidia-xconfig-440.100-1.fc32
xorg-x11-drv-nvidia-390xx-390.138-1.fc32
xorg-x11-drv-nvidia-440.100-1.fc32
Pushed to stable:
EL 6
-------------
Pushed to testing:
Pushed to stable:
EL 7
-------------
Pushed to testing:
nvidia-390xx-kmod-390.138-1.el7
nvidia-kmod-440.100-1.el7
nvidia-modprobe-440.100-1.el7
nvidia-persistenced-440.100-1.el7
nvidia-settings-390xx-390.138-1.el7
nvidia-settings-440.100-1.el7
nvidia-xconfig-440.100-1.el7
xorg-x11-drv-nvidia-390xx-390.138-1.el7
xorg-x11-drv-nvidia-440.100-1.el7
Pushed to stable:
EL 8
-------------
Pushed to testing:
nvidia-390xx-kmod-390.138-1.el8
nvidia-kmod-440.100-1.el8
nvidia-kmod-440.100-2.el8
nvidia-modprobe-440.100-1.el8
nvidia-persistenced-440.100-1.el8
nvidia-settings-390xx-390.138-1.el8
nvidia-settings-440.100-1.el8
nvidia-xconfig-440.100-1.el8
xorg-x11-drv-nvidia-390xx-390.138-1.el8
xorg-x11-drv-nvidia-440.100-1.el8
Pushed to stable:
Theses packages will be available in main mirror in a few hours. Wait for local mirrors to sync
Please report any issue to https://bugzilla.rpmfusion.org
1 week, 2 days
Re: Updated howto related to CUDA and nvidia-driver
by Nicolas Chauvet
Le ven. 26 juin 2020 à 13:21, Vitaly Zaitsev via rpmfusion-developers
<rpmfusion-developers(a)lists.rpmfusion.org> a écrit :
>
> On 26.06.2020 12:23, Nicolas Chauvet wrote:
> > FYI, I've updated some nvidia howto related to CUDA:
> > https://rpmfusion.org/Howto/CUDA
>
> What do you think about packaging of CUDA SDK for RPM Fusion?
If you or others want to volunteer doing so I won't prevent it.
On my side, I see little value doing so. and I would not do this task
for free anyway.
I see more value to build a dedicated cuda community based repository
with cuda enabled content whatever the compiler used.
1 week, 4 days
RPM Fusion update report 2020-06-25
by noreply＠rpmfusion.org
RPM Fusion update report
------------------------
Section free:
-------------
Fedora 31
-------------
Pushed to testing:
ffmpeg-4.2.3-4.fc31
mpv-0.32.0-6.fc31
retroarch-freeworld-1.8.9-1.fc31
telegram-desktop-2.1.13-1.fc31
Pushed to stable:
chromium-freeworld-83.0.4103.106-1.fc31
smplayer-20.6.0-1.fc31
smtube-20.6.0-1.fc31
xroar-0.36.1-2.fc31
Fedora 32
-------------
Pushed to testing:
ffmpeg-4.2.3-4.fc32
mpv-0.32.0-6.fc32
qt-heif-image-plugin-0.3.3-2.fc32
retroarch-freeworld-1.8.9-1.fc32
telegram-desktop-2.1.13-1.fc32
Pushed to stable:
chromium-freeworld-83.0.4103.106-1.fc32
smplayer-20.6.0-1.fc32
smtube-20.6.0-1.fc32
xroar-0.36.1-2.fc32
EL 6
-------------
Pushed to testing:
Pushed to stable:
EL 7
-------------
Pushed to testing:
Pushed to stable:
smplayer-20.6.0-1.el7
smtube-20.6.0-1.el7
EL 8
-------------
Pushed to testing:
ffmpeg-4.2.3-4.el8
mpv-0.32.0-6.el8
Pushed to stable:
smplayer-20.6.0-1.el8
smtube-20.6.0-1.el8
vlc-3.0.11-1.el8
Section nonfree:
-------------
Fedora 31
-------------
Pushed to testing:
Pushed to stable:
Fedora 32
-------------
Pushed to testing:
Pushed to stable:
dfhack-0.47.04-2.r1.fc32
dwarftherapist-41.1.7-1.fc32
EL 6
-------------
Pushed to testing:
Pushed to stable:
EL 7
-------------
Pushed to testing:
Pushed to stable:
EL 8
-------------
Pushed to testing:
Pushed to stable:
Theses packages will be available in main mirror in a few hours. Wait for local mirrors to sync
Please report any issue to https://bugzilla.rpmfusion.org
1 week, 5 days
RPM Fusion update report 2020-06-21
by noreply＠rpmfusion.org
RPM Fusion update report
------------------------
Section free:
-------------
Fedora 31
-------------
Pushed to testing:
chromium-freeworld-83.0.4103.106-1.fc31
smplayer-20.6.0-1.fc31
smtube-20.6.0-1.fc31
xroar-0.36.1-2.fc31
Pushed to stable:
VirtualBox-6.1.10-4.fc31
python-vlc-3.0.10114-1.fc31
telegram-desktop-2.1.12-1.fc31
vlc-3.0.11-1.fc31
Fedora 32
-------------
Pushed to testing:
chromium-freeworld-83.0.4103.106-1.fc32
smplayer-20.6.0-1.fc32
smtube-20.6.0-1.fc32
xroar-0.36.1-2.fc32
Pushed to stable:
VirtualBox-6.1.10-4.fc32
python-vlc-3.0.10114-1.fc32
telegram-desktop-2.1.12-1.fc32
vlc-3.0.11-1.fc32
EL 6
-------------
Pushed to testing:
Pushed to stable:
EL 7
-------------
Pushed to testing:
smplayer-20.6.0-1.el7
smtube-20.6.0-1.el7
Pushed to stable:
VirtualBox-6.1.10-4.el7
vlc-3.0.11-1.el7
EL 8
-------------
Pushed to testing:
smplayer-20.6.0-1.el8
smtube-20.6.0-1.el8
vlc-3.0.11-1.el8
Pushed to stable:
gstreamer1-libav-1.16.1-1.el8
gstreamer1-plugins-bad-freeworld-1.16.1-1.el8
gstreamer1-plugins-ugly-1.16.1-1.el8
Section nonfree:
-------------
Fedora 31
-------------
Pushed to testing:
Pushed to stable:
Fedora 32
-------------
Pushed to testing:
dfhack-0.47.04-2.r1.fc32
dwarftherapist-41.1.7-1.fc32
Pushed to stable:
EL 6
-------------
Pushed to testing:
Pushed to stable:
EL 7
-------------
Pushed to testing:
Pushed to stable:
EL 8
-------------
Pushed to testing:
xorg-x11-drv-nvidia-340xx-340.108-3.el8
Pushed to stable:
gstreamer1-plugins-bad-nonfree-1.16.1-1.el8
Theses packages will be available in main mirror in a few hours. Wait for local mirrors to sync
Please report any issue to https://bugzilla.rpmfusion.org
2 weeks, 2 days
RPM Fusion update report 2020-06-18
by noreply＠rpmfusion.org
RPM Fusion update report
------------------------
Section free:
-------------
Fedora 31
-------------
Pushed to testing:
VirtualBox-6.1.10-4.fc31
python-vlc-3.0.10114-1.fc31
telegram-desktop-2.1.12-1.fc31
vlc-3.0.11-1.fc31
Pushed to stable:
HandBrake-1.3.3-1.fc31
kdenlive-20.04.2-1.fc31
libheif-1.7.0-1.fc31
xpra-codecs-freeworld-4.0.2-1.fc31
xroar-0.36-1.fc31
Fedora 32
-------------
Pushed to testing:
VirtualBox-6.1.10-4.fc32
python-vlc-3.0.10114-1.fc32
qt5-qtwebengine-freeworld-5.14.2-1.fc32
telegram-desktop-2.1.12-1.fc32
vlc-3.0.11-1.fc32
Pushed to stable:
HandBrake-1.3.3-1.fc32
kdenlive-20.04.2-1.fc32
libheif-1.7.0-1.fc32
xpra-codecs-freeworld-4.0.2-1.fc32
xroar-0.36-1.fc32
EL 6
-------------
Pushed to testing:
Pushed to stable:
EL 7
-------------
Pushed to testing:
VirtualBox-6.1.10-4.el7
vlc-3.0.11-1.el7
Pushed to stable:
VirtualBox-6.1.10-3.el7
EL 8
-------------
Pushed to testing:
gstreamer1-libav-1.16.1-1.el8
gstreamer1-plugins-bad-freeworld-1.16.1-1.el8
gstreamer1-plugins-ugly-1.16.1-1.el8
Pushed to stable:
HandBrake-1.3.3-1.el8
VirtualBox-6.1.10-3.el8
libheif-1.7.0-1.el8
Section nonfree:
-------------
Fedora 31
-------------
Pushed to testing:
Pushed to stable:
Fedora 32
-------------
Pushed to testing:
Pushed to stable:
EL 6
-------------
Pushed to testing:
Pushed to stable:
EL 7
-------------
Pushed to testing:
Pushed to stable:
EL 8
-------------
Pushed to testing:
gstreamer1-plugins-bad-nonfree-1.16.1-1.el8
Pushed to stable:
Theses packages will be available in main mirror in a few hours. Wait for local mirrors to sync
Please report any issue to https://bugzilla.rpmfusion.org
2 weeks, 5 days
