Index: radix-1.9/X11/media/pulseaudio/16.1/Makefile
===================================================================
--- radix-1.9/X11/media/pulseaudio/16.1/Makefile (revision 211)
+++ radix-1.9/X11/media/pulseaudio/16.1/Makefile (revision 212)
@@ -355,6 +355,8 @@
ifneq ($(filter $(TOOLCHAIN),$(TOOLCHAIN_RK358X_GLIBC)),)
# ======= Set default pulseaudio output card =======
@sed -i 's,^#set-default-sink output,set-default-sink alsa_output.platform-hdmi0-sound.hdmi-stereo,' $(PAUDIO_PKG)/etc/pulse/default.pa.new
+ # ------- Remove previous defaul.pa due to different content: -------
+ @rm -f $(ROOTFS_DEST_DIR)/etc/pulse/default.pa
endif
# ======= Move dbus configs to system location =======
@mkdir -p $(PAUDIO_PKG)/usr/share/dbus-1/system.d/
Index: radix-1.9/libs/freetype/2.11.1/freetype-pkg-install.sh
===================================================================
--- radix-1.9/libs/freetype/2.11.1/freetype-pkg-install.sh (revision 211)
+++ radix-1.9/libs/freetype/2.11.1/freetype-pkg-install.sh (revision 212)
@@ -1,5 +1,19 @@
#!/bin/sh
+# Preserve new files
+install_file() {
+ NEW="$1"
+ OLD="`dirname $NEW`/`basename $NEW .new`"
+ # If there's no file by that name, mv it over:
+ if [ ! -r $OLD ]; then
+ mv $NEW $OLD
+ elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+ rm $NEW
+ fi
+ # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+
# arg 1: the new package version
pre_install() {
/bin/true
@@ -7,7 +21,8 @@
# arg 1: the new package version
post_install() {
- /bin/true
+ install_file etc/profile.d/freetype2.csh.new
+ install_file etc/profile.d/freetype2.sh.new
}
# arg 1: the new package version